make Veins compatible with OMNeT++ 5

examples/veins/omnetpp.ini

@@ -5,7 +5,6 @@ cmdenv-status-frequency = 10000000s
 
 #tkenv-default-config = debug
 #tkenv-default-run = 1
-
 ned-path = .
 
 network = RSUExampleScenario

src/veins/base/connectionManager/BaseConnectionManager.cc

@@ -8,7 +8,7 @@
 #include "veins/base/utils/FindModule.h"
 
 #ifndef ccEV
-#define ccEV (getEnvir()->isDisabled()||!coreDebug) ? EV : EV << getName() << ": "
+#define ccEV EV << getName() << ": "
 #endif
 
 namespace {

src/veins/base/connectionManager/ConnectionManager.cc

@@ -5,7 +5,7 @@
 #include "veins/base/modules/BaseWorldUtility.h"
 
 #ifndef ccEV
-#define ccEV (getEnvir()->isDisabled()||!coreDebug) ? EV : EV << getName() << ": "
+#define ccEV EV << getName() << ": "
 #endif
 
 Define_Module( ConnectionManager );

src/veins/base/connectionManager/NicEntryDebug.cc

@@ -27,7 +27,7 @@
 #include "veins/base/utils/FindModule.h"
 
 #ifndef nicEV
-#define nicEV (getEnvir()->isDisabled()||!coreDebug) ? EV : EV << "NicEntry: "
+#define nicEV EV << "NicEntry: "
 #endif
 
 using std::endl;
@@ -80,7 +80,7 @@ int NicEntryDebug::collectGates(const char* pattern, GateStack& gates)
 	{
 		cGate* hostGate = host->gate(gateName);
 		if(hostGate->isConnectedOutside()) {
-			throw cException("Gate %s is still connected but not registered with this "
+			throw cRuntimeError("Gate %s is still connected but not registered with this "
 					  "NicEntry. Either the last NicEntry for this NIC did not "
 					  "clean up correctly or another gate creation module is "
 					  "interfering with this one!", gateName);

src/veins/base/connectionManager/NicEntryDirect.cc

@@ -24,7 +24,7 @@
 #include "veins/base/connectionManager/ChannelAccess.h"
 
 #ifndef nicEV
-#define nicEV (getEnvir()->isDisabled()||!coreDebug) ? EV : EV << "NicEntry: "
+#define nicEV EV << "NicEntry: "
 #endif
 
 using std::endl;

src/veins/base/modules/BaseApplLayer.h

@@ -127,14 +127,14 @@ class MIXIM_API BaseApplLayer : public BaseLayer
 	 */
 	virtual void handleUpperMsg(cMessage *msg) {
 		assert(false);
-		throw cException("Application has no upper layers!");
+		throw cRuntimeError("Application has no upper layers!");
 		delete msg;
 	}
 
 	/** @brief Handle control messages from upper layer */
 	virtual void handleUpperControl(cMessage *msg) {
 		assert(false);
-		throw cException("Application has no upper layers!");
+		throw cRuntimeError("Application has no upper layers!");
 		delete msg;
 	}
 

src/veins/base/modules/BaseLayer.cc

@@ -96,14 +96,14 @@ void BaseLayer::handleMessage(cMessage* msg)
          * it would be wrong to forward the message to one of these gates,
          * as they actually don't exist, so raise an error instead.
          */
-        throw cException("No self message and no gateID?? Check configuration.");
+        throw cRuntimeError("No self message and no gateID?? Check configuration.");
     } else {
         /* msg->getArrivalGateId() should be valid, but it isn't recognized
          * here. This could signal the case that this class is extended
          * with extra gates, but handleMessage() isn't overridden to
          * check for the new gate(s).
          */
-        throw cException("Unknown gateID?? Check configuration or override handleMessage().");
+        throw cRuntimeError("Unknown gateID?? Check configuration or override handleMessage().");
     }
 }
 

src/veins/base/modules/BaseMobility.cc

@@ -283,7 +283,7 @@ void BaseMobility::updatePosition() {
     //publish the the new move
     emit(mobilityStateChangedSignal, this);
 
-    if(getEnvir()->isGUI())
+    if(hasGUI())
     {
     	std::ostringstream osDisplayTag;
 #ifdef __APPLE__

src/veins/base/modules/BaseMobility.ned

@@ -14,7 +14,7 @@ simple BaseMobility like IMobility
         double x; // x coordinate of the nodes' position (-1 = random)
         double y; // y coordinate of the nodes' position (-1 = random)
         double z; // z coordinate of the nodes' position (-1 = random)
-	@signal[veinsmobilityStateChanged](type="BaseMobility");
+        @signal[veinsmobilityStateChanged](type="BaseMobility");
         @display("i=block/cogwheel");
 }
 

src/veins/base/modules/BaseModule.cc

@@ -59,7 +59,7 @@ void BaseModule::receiveSignal(cComponent *source, simsignal_t signalID, cObject
 			handleHostState(*pHostState);
 		}
 		else {
-			throw cException("Got catHostStateSignal but obj was not a HostState pointer?");
+			throw cRuntimeError("Got catHostStateSignal but obj was not a HostState pointer?");
 		}
 	}
 }

src/veins/base/modules/BaseModule.h

@@ -29,13 +29,13 @@
 #include "veins/base/utils/HostState.h"
 
 #ifndef debugEV
-#define debugEV_clear (getEnvir()->isDisabled()||!debug) ? EV : EV
-#define debugEV (getEnvir()->isDisabled()||!debug) ? EV : EV << logName() << "::" << getClassName() << ": "
+#define debugEV_clear EV
+#define debugEV EV << logName() << "::" << getClassName() << ": "
 #endif
 
 #ifndef coreEV
-#define coreEV_clear (getEnvir()->isDisabled()||!coreDebug) ? EV : EV
-#define coreEV (getEnvir()->isDisabled()||!coreDebug) ? EV : EV << logName() << "::" << getClassName() <<": "
+#define coreEV_clear EV
+#define coreEV EV << logName() << "::" << getClassName() << ": "
 #endif
 
 /**

src/veins/base/modules/BaseWorldUtility.cc

@@ -37,7 +37,7 @@ void BaseWorldUtility::initialize(int stage) {
 		//check if necessary modules are there
 		//Connection Manager
 		if(!FindModule<BaseConnectionManager*>::findGlobalModule()) {
-			throw cException("Could not find a connection manager module in the network!");
+			throw cRuntimeError("Could not find a connection manager module in the network!");
 		}
 	}
 }
@@ -53,15 +53,15 @@ void BaseWorldUtility::initializeIfNecessary()
                                use2DFlag ? 0. : par("playgroundSizeZ").doubleValue());
 
 	if(playgroundSize.x < 0) {
-		throw cException("Playground size in X direction is invalid: "\
+		throw cRuntimeError("Playground size in X direction is invalid: "\
 				  "(%f). Should be greater than or equal to zero.", playgroundSize.x);
 	}
 	if(playgroundSize.y < 0) {
-		throw cException("Playground size in Y direction is invalid: "\
+	    throw cRuntimeError("Playground size in Y direction is invalid: "\
 				  "(%f). Should be greater than or equal to zero.", playgroundSize.y);
 	}
 	if(!use2DFlag && playgroundSize.z < 0) {
-		throw cException("Playground size in Z direction is invalid: "\
+	    throw cRuntimeError("Playground size in Z direction is invalid: "\
 				  "(%f). Should be greater than or equal to zero.", playgroundSize.z);
 	}
 

src/veins/base/modules/BatteryAccess.cc

@@ -25,7 +25,7 @@ void BatteryAccess::registerWithBattery(const std::string& name, int numAccounts
 	battery = FindModule<BaseBattery*>::findSubModule(findHost());
 
 	if(!battery) {
-		throw cException("No battery module defined!");
+		throw cRuntimeError("No battery module defined!");
 	} else {
 		deviceID = battery->registerDevice(name, numAccounts);
 	}

src/veins/base/phyLayer/BaseDecider.cc

@@ -76,7 +76,7 @@ simtime_t BaseDecider::processSignalEnd(AirFrame* frame) {
 }
 
 simtime_t BaseDecider::processUnknownSignal(AirFrame* frame) {
-	throw cException("Unknown state for the AirFrame with ID %d", frame->getId());
+	throw cRuntimeError("Unknown state for the AirFrame with ID %d", frame->getId());
 	return notAgain;
 }
 
@@ -100,7 +100,7 @@ simtime_t BaseDecider::handleChannelSenseRequest(ChannelSenseRequest* request) {
 	}
 
 	if (currentChannelSenseRequest.first != request) {
-		throw cException("Got a new ChannelSenseRequest while already handling another one!");
+	    throw cRuntimeError("Got a new ChannelSenseRequest while already handling another one!");
 		return notAgain;
 	}
 

src/veins/base/phyLayer/BaseDecider.h

@@ -15,7 +15,7 @@ class Mapping;
 
 using Veins::AirFrame;
 
-#define deciderEV (getEnvir()->isDisabled()||!debug) ? EV : EV << "[Host " << myIndex << "] - PhyLayer(Decider): "
+#define deciderEV EV << "[Host " << myIndex << "] - PhyLayer(Decider): "
 
 /**
  * @brief Provides some base functionality for most common deciders.
@@ -185,7 +185,7 @@ class MIXIM_API BaseDecider: public Decider {
 	 * Default implementation does not handle signal headers.
 	 */
 	virtual simtime_t processSignalHeader(AirFrame* frame) {
-		throw cException("BaseDecider does not handle Signal headers!");
+		throw cRuntimeError("BaseDecider does not handle Signal headers!");
 		return notAgain;
 	}