PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation error when using GCC 8, C++11 and C complex functions.

This commit is contained in:
Pedro Alvarez 2019-04-26 12:46:30 +01:00 committed by Andre Puschmann
parent 879f5e627d
commit c51a8bfe9d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srsenb/src/phy/sf_worker.cc
View File

@ -886,7 +886,7 @@ int sf_worker::read_ce_abs(float* ce_abs)
bzero(ce_abs, sizeof(float) * sz);
int g = (sz - 12 * phy->cell.nof_prb) / 2;
for (i = 0; i < 12 * phy->cell.nof_prb; i++) {
ce_abs[g + i] = 20 * log10(cabs(enb_ul.chest_res.ce[i]));
ce_abs[g + i] = 20 * log10(std::abs(std::complex<double>(enb_ul.chest_res.ce[i])));
if (isinf(ce_abs[g + i])) {
ce_abs[g + i] = -80;
}
@ -901,7 +901,7 @@ int sf_worker::read_ce_arg(float* ce_arg)
bzero(ce_arg, sizeof(float) * sz);
int g = (sz - 12 * phy->cell.nof_prb) / 2;
for (i = 0; i < 12 * phy->cell.nof_prb; i++) {
ce_arg[g + i] = cargf(enb_ul.chest_res.ce[i]) * 180.0f / (float)M_PI;
ce_arg[g + i] = std::arg(std::complex<float>(enb_ul.chest_res.ce[i])) * 180.0f / (float)M_PI;
if (isinf(ce_arg[g + i])) {
ce_arg[g + i] = -80;
}

2
srsue/src/phy/cc_worker.cc
View File

@ -1402,7 +1402,7 @@ int cc_worker::read_ce_abs(float* ce_abs, uint32_t tx_antenna, uint32_t rx_anten
bzero(ce_abs, sizeof(float) * sz);
int g = (sz - 12 * cell.nof_prb) / 2;
for (i = 0; i < 12 * cell.nof_prb; i++) {
ce_abs[g + i] = 20 * log10f(cabsf(ue_dl.chest_res.ce[tx_antenna][rx_antenna][i]));
ce_abs[g + i] = 20 * log10f(std::abs(std::complex<float>(ue_dl.chest_res.ce[tx_antenna][rx_antenna][i])));
if (std::isinf(ce_abs[g + i])) {
ce_abs[g + i] = -80;
}