fix merge NR_SA_F1AP_5GRECORDS and fix warnings, a regression in UE (LCID lopp)

2021-06-21 21:01:59 +02:00
parent 83950e6c57
commit aef67d0310
24 changed files with 32 additions and 81 deletions
@@ -38,13 +38,6 @@
 #include "common/ran_context.h"
 #include "openair3/UTILS/conversions.h"

-// undefine C_RNTI from
-// openair1/PHY/LTE_TRANSPORT/transport_common.h which
-// replaces in ie->value.choice.C_RNTI, causing
-// a compile error
-#undef C_RNTI 
-
-
 // Bing Kai: create CU and DU context, and put all the information there.
 uint64_t        du_ue_f1ap_id = 0;
 uint32_t        f1ap_assoc_id = 0;