mirror of https://github.com/PentHertz/srsLTE.git
fix clang 6.0.0 compilation issue related with {} initialization
This commit is contained in:
parent
6b79116805
commit
18f0732c66
|
@ -75,9 +75,9 @@ int rrc_nr::init(const rrc_nr_cfg_t& cfg_,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate cell config structs
|
// Generate cell config structs
|
||||||
cell_ctxt.reset(new cell_ctxt_t{});
|
cell_ctxt.reset(new cell_ctxt_t());
|
||||||
if (cfg.is_standalone) {
|
if (cfg.is_standalone) {
|
||||||
std::unique_ptr<cell_group_cfg_s> master_cell_group{new cell_group_cfg_s{}};
|
std::unique_ptr<cell_group_cfg_s> master_cell_group{new cell_group_cfg_s()};
|
||||||
int ret = fill_master_cell_cfg_from_enb_cfg(cfg, 0, *master_cell_group);
|
int ret = fill_master_cell_cfg_from_enb_cfg(cfg, 0, *master_cell_group);
|
||||||
srsran_assert(ret == SRSRAN_SUCCESS, "Failed to configure MasterCellGroup");
|
srsran_assert(ret == SRSRAN_SUCCESS, "Failed to configure MasterCellGroup");
|
||||||
cell_ctxt->master_cell_group = std::move(master_cell_group);
|
cell_ctxt->master_cell_group = std::move(master_cell_group);
|
||||||
|
|
|
@ -49,7 +49,7 @@ void test_sib_generation()
|
||||||
enb_bearer_manager bearer_mapper;
|
enb_bearer_manager bearer_mapper;
|
||||||
|
|
||||||
// set cfg
|
// set cfg
|
||||||
rrc_nr_cfg_t rrc_cfg_nr = {};
|
rrc_nr_cfg_t rrc_cfg_nr;
|
||||||
rrc_cfg_nr.cell_list.emplace_back();
|
rrc_cfg_nr.cell_list.emplace_back();
|
||||||
generate_default_nr_cell(rrc_cfg_nr.cell_list[0]);
|
generate_default_nr_cell(rrc_cfg_nr.cell_list[0]);
|
||||||
rrc_cfg_nr.cell_list[0].phy_cell.carrier.pci = 500;
|
rrc_cfg_nr.cell_list[0].phy_cell.carrier.pci = 500;
|
||||||
|
@ -107,7 +107,7 @@ int test_rrc_setup()
|
||||||
rrc_nr rrc_obj(&task_sched);
|
rrc_nr rrc_obj(&task_sched);
|
||||||
|
|
||||||
// set cfg
|
// set cfg
|
||||||
rrc_nr_cfg_t rrc_cfg_nr = rrc_nr_cfg_t{};
|
rrc_nr_cfg_t rrc_cfg_nr;
|
||||||
rrc_cfg_nr.cell_list.emplace_back();
|
rrc_cfg_nr.cell_list.emplace_back();
|
||||||
generate_default_nr_cell(rrc_cfg_nr.cell_list[0]);
|
generate_default_nr_cell(rrc_cfg_nr.cell_list[0]);
|
||||||
rrc_cfg_nr.cell_list[0].phy_cell.carrier.pci = 500;
|
rrc_cfg_nr.cell_list[0].phy_cell.carrier.pci = 500;
|
||||||
|
@ -150,7 +150,7 @@ void test_rrc_sa_connection()
|
||||||
rrc_nr rrc_obj(&task_sched);
|
rrc_nr rrc_obj(&task_sched);
|
||||||
|
|
||||||
// set cfg
|
// set cfg
|
||||||
rrc_nr_cfg_t rrc_cfg_nr = rrc_nr_cfg_t{};
|
rrc_nr_cfg_t rrc_cfg_nr;
|
||||||
rrc_cfg_nr.cell_list.emplace_back();
|
rrc_cfg_nr.cell_list.emplace_back();
|
||||||
generate_default_nr_cell(rrc_cfg_nr.cell_list[0]);
|
generate_default_nr_cell(rrc_cfg_nr.cell_list[0]);
|
||||||
rrc_cfg_nr.cell_list[0].phy_cell.carrier.pci = 500;
|
rrc_cfg_nr.cell_list[0].phy_cell.carrier.pci = 500;
|
||||||
|
|
Loading…
Reference in New Issue