general: fix to build with OMNeT++ 5.5

inet-framework · May 22, 2019 · ce69d08 · ce69d08
1 parent 810053f
commit ce69d08
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/WHATSNEW b/WHATSNEW
@@ -1,6 +1,12 @@
 Recent changes in the INET Framework
 ====================================
 
+INET-4.1.1 (May 2019) - Stable
+------------------------------
+
+- A minor fix to build with OMNeT++ 5.5, too.
+
+
 INET-4.1 (January 2019) - Stable
 ---------------------------------
 

diff --git a/src/inet/common/INETDefs.h b/src/inet/common/INETDefs.h
@@ -46,7 +46,7 @@ using namespace omnetpp;
 #endif // if OMNETPP_VERSION < 0x0504
 
 #define INET_VERSION  0x0401
-#define INET_PATCH_LEVEL 0x00
+#define INET_PATCH_LEVEL 0x01
 
 #if OMNETPP_VERSION < 0x0600
 #define OMNETPP5_CODE(x) x

diff --git a/src/inet/common/queue/PacketQueue.cc b/src/inet/common/queue/PacketQueue.cc
@@ -20,7 +20,11 @@
 namespace inet {
 
 PacketQueue::PacketQueue(const char *name) :
+#if OMNETPP_BUILDNUM >= 1021
+    cPacketQueue(name)
+#else
     cPacketQueue(name, nullptr)
+#endif
 {
 }
 

diff --git a/src/inet/linklayer/ieee80211/mac/queue/Ieee80211Queue.cc b/src/inet/linklayer/ieee80211/mac/queue/Ieee80211Queue.cc
@@ -22,7 +22,11 @@ namespace inet {
 namespace ieee80211 {
 
 Ieee80211Queue::Ieee80211Queue(int maxQueueSize, const char *name) :
+#if OMNETPP_BUILDNUM >= 1021
+    cQueue(name)
+#else
     cQueue(name, nullptr)
+#endif
 {
     this->maxQueueSize = maxQueueSize;
 }