fix wrong namespace definition in various places

This commit is contained in:
Andre Puschmann 2019-08-07 14:32:14 +02:00
parent 343c30be4a
commit e42449532b
19 changed files with 18 additions and 27 deletions

View File

@ -242,6 +242,6 @@ allocate_unique_buffer(byte_buffer_pool& pool, const char* debug_name, bool bloc
return std::move(unique_byte_buffer_t(pool.allocate(debug_name, blocking), byte_buffer_deleter(&pool)));
}
} // namespace srsue
} // namespace srslte
#endif // SRSLTE_BUFFER_POOL_H

View File

@ -94,6 +94,6 @@ protected:
std::string hex_string(const uint8_t *hex, int size);
};
} // namespace srsue
} // namespace srslte
#endif // SRSLTE_LOG_FILTER_H

View File

@ -55,6 +55,6 @@ private:
uint16_t channel_id);
};
} // namespace srsue
} // namespace srslte
#endif // RLCPCAP_H

View File

@ -68,8 +68,8 @@ class tti_sync
uint32_t modulus;
uint32_t producer_cntr;
uint32_t consumer_cntr;
};
};
} // namespace srsue
} // namespace srslte
#endif // SRSLTE_TTI_SYNC_H

View File

@ -109,7 +109,6 @@ private:
bool valid_lcid_mrb(uint32_t lcid);
};
} // namespace srsue
} // namespace srslte
#endif // SRSLTE_RLC_H

View File

@ -78,7 +78,6 @@ private:
rlc_tx_queue ul_queue;
};
} // namespace srsue
} // namespace srslte
#endif // SRSLTE_RLC_TM_H

View File

@ -225,7 +225,6 @@ uint32_t rlc_um_packed_length(rlc_umd_pdu_header_t *header);
bool rlc_um_start_aligned(uint8_t fi);
bool rlc_um_end_aligned(uint8_t fi);
} // namespace srsue
} // namespace srslte
#endif // SRSLTE_RLC_UM_H

View File

@ -49,5 +49,5 @@ void byte_buffer_pool::cleanup(void)
}
pthread_mutex_unlock(&instance_mutex);
}
} // namespace srsue
} // namespace srslte

View File

@ -297,4 +297,4 @@ std::string log_filter::hex_string(const uint8_t *hex, int size)
return ss.str();
}
} // namespace srsue
} // namespace srslte

View File

@ -121,4 +121,4 @@ void logger_file::flush() {
}
}
} // namespace srsue
} // namespace srslte

View File

@ -290,5 +290,4 @@ uint8_t security_milenage_f5_star( uint8_t *k,
ak);
}
} // namespace srsue
} // namespace srslte

View File

@ -314,4 +314,4 @@ bool pdcp::valid_mch_lcid(uint32_t lcid)
return true;
}
} // namespace srsue
} // namespace srslte

View File

@ -193,4 +193,4 @@ void rlc_tm::write_pdu(uint8_t *payload, uint32_t nof_bytes)
}
}
} // namespace srsue
} // namespace srslte

View File

@ -1077,4 +1077,4 @@ bool rlc_um_end_aligned(uint8_t fi)
return (fi == RLC_FI_FIELD_START_AND_END_ALIGNED || fi == RLC_FI_FIELD_NOT_START_ALIGNED);
}
} // namespace srsue
} // namespace srslte

View File

@ -19,7 +19,6 @@
*
*/
#include "../../../srsue/hdr/stack/rrc/rrc.h"
#include "srslte/asn1/rrc_asn1.h"
#include "srslte/common/bcd_helpers.h"
#include "srslte/common/log_filter.h"

View File

@ -19,7 +19,6 @@
*
*/
#include "../../../srsue/hdr/stack/rrc/rrc.h"
#include "srslte/asn1/rrc_asn1.h"
#include "srslte/common/bcd_helpers.h"
#include "srslte/common/log_filter.h"

View File

@ -19,7 +19,7 @@
*
*/
#include "../../../srsue/hdr/stack/rrc/rrc.h"
#include "../../../srsue/hdr/stack/rrc/rrc.h" // for rrc_args_t
#include "srslte/asn1/rrc_asn1.h"
#include "srslte/common/bcd_helpers.h"
#include "srslte/common/log_filter.h"

View File

@ -35,7 +35,6 @@
#define NBUFS 5
using namespace srslte;
using namespace srsue;
using namespace asn1::rrc;
class mac_dummy_timers : public srslte::mac_interface_timers
@ -50,7 +49,7 @@ private:
srslte::timers::timer t;
};
class rlc_tester : public pdcp_interface_rlc, public rrc_interface_rlc
class rlc_tester : public srsue::pdcp_interface_rlc, public srsue::rrc_interface_rlc
{
public:
rlc_tester()

View File

@ -31,8 +31,6 @@ uint32_t PDU1_LEN = 2;
uint8_t pdu2[] = {0x1C ,0xE1 ,0x06 ,0x80};
uint32_t PDU2_LEN = 4;
using namespace srsue;
int main(int argc, char **argv) {
srslte::rlc_umd_pdu_header_t h;
srslte::byte_buffer_t b1,b2;