Merge remote-tracking branch 'origin/fix_nrqtscope_build_warnings' into integration_2023_w10b

cmake_targets/macros.cmake

@@ -55,7 +55,7 @@ macro(add_list2_option name val helpstr)
   endif()
   set(${name} ${value} CACHE STRING "${helpstr}")
   set_property(CACHE ${name} PROPERTY STRINGS ${ARGN})
-  if(NOT "${value}" STREQUAL "False")
+  if(NOT "${value}" STREQUAL "None")
     add_definitions("-D${value}=1")
   endif()
 endmacro(add_list2_option)

openair1/PHY/impl_defs_lte_NB_IoT.h

@@ -33,6 +33,7 @@
 #ifndef __PHY_IMPL_DEFS_NB_IOT__H__
 #define __PHY_IMPL_DEFS_NB_IOT__H__
 
+#include <asn_SEQUENCE_OF.h>
 #include "types_NB_IoT.h"
 //#include "defs.h"
 
@@ -40,17 +41,6 @@ typedef enum {TDD_NB_IoT=1,FDD_NB_IoT=0} NB_IoT_frame_type_t;
 typedef enum {EXTENDED_NB_IoT=1,NORMAL_NB_IoT=0} NB_IoT_prefix_type_t;
 typedef enum {SF_DL_NB_IoT, SF_UL_NB_IoT, SF_S_NB_IoT} NB_IoT_subframe_t;
 
-#define	A_SEQUENCE_OF(type)	A_SET_OF(type)
-
-#define	A_SET_OF(type)					\
-	struct {					\
-		type **array;				\
-		int count;	/* Meaningful size */	\
-		int size;	/* Allocated size */	\
-		void (*free)(type *);			\
-	}
-
-
 /////////////////////////
   /// Union for \ref TPC_PDCCH_CONFIG::tpc_Index.
 typedef union {

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -113,11 +113,11 @@ typedef struct {
 } __attribute__ ((__packed__)) NR_MAC_SUBHEADER_FIXED;
 
 static inline int get_mac_len(uint8_t* pdu, int pdu_len, uint16_t *mac_ce_len, uint16_t *mac_subheader_len) {
-  if ( pdu_len < sizeof(NR_MAC_SUBHEADER_SHORT))
+  if ( pdu_len < (int)sizeof(NR_MAC_SUBHEADER_SHORT))
     return false;
   NR_MAC_SUBHEADER_SHORT *s = (NR_MAC_SUBHEADER_SHORT*) pdu;
   NR_MAC_SUBHEADER_LONG *l = (NR_MAC_SUBHEADER_LONG*) pdu;
-  if (s->F && pdu_len < sizeof(NR_MAC_SUBHEADER_LONG))
+  if (s->F && pdu_len < (int)sizeof(NR_MAC_SUBHEADER_LONG))
     return false;
   if (s->F) {
     *mac_subheader_len = sizeof(*l);