- fix make structure (remove macOld exception, no --genconfig anymore)

- fix some minor gcc warnings
- fix timers (double --> simtime_t)


git-svn-id: https://mixim.svn.sourceforge.net/svnroot/mixim/trunk@460 ccb5d51d-3e1d-0410-9886-bf3c9037c363

base/timers/Timer.h

@@ -58,15 +58,15 @@ class Timer
 		@param index Timer number to set.
 		@param when Time in seconds in the future to fire the timer
 	 */
-	void setTimer(unsigned int index, double when){checkCT();ct->setTimer(index,when);}
+	void setTimer(unsigned int index, simtime_t when){checkCT();ct->setTimer(index,when);}
 
 	/** Set a timer to fire at a point in the future.
 	    Auto-generates a timer id. This will not be an id allocated to any other existing timer
 		(either running or finished) but may be an id from a timer deleted by deleteTimer.
 		@param when Time in seconds in the future to fire the timer
 		@return Timer id
 	 */
-	unsigned int setTimer(double when){checkCT();return ct->setTimer(when);}
+	unsigned int setTimer(simtime_t when){checkCT();return ct->setTimer(when);}
 
 	/** Cancel an existing timer set by @b setTimer()
 		If the timer has not been set, or has already fires, this does nothing

base/timers/TimerCore.cc

@@ -25,7 +25,7 @@ void TimerCore::init(Timer *owner)
 	destructors = new std::map<unsigned int,cleanup *>();
 }
 
-unsigned int TimerCore::setTimer(double when)
+unsigned int TimerCore::setTimer(simtime_t when)
 {
 	unsigned int key = timers->size();
 	while (timers->find(key)!=timers->end())
@@ -34,7 +34,7 @@ unsigned int TimerCore::setTimer(double when)
 	return key;
 }
 
-void TimerCore::setTimer(unsigned int index, double when)
+void TimerCore::setTimer(unsigned int index, simtime_t when)
 {
 	Enter_Method_Silent();
 	cMessage *timer;

base/timers/TimerCore.h

@@ -31,15 +31,15 @@ class TimerCore: public BaseModule
 			@param index Timer number to set.
 			@param when Time in seconds in the future to fire the timer
 		 */
-		void setTimer(unsigned int index, double when);
+		void setTimer(unsigned int index, simtime_t when);
 
 		/** Set a timer to fire at a point in the future.
 			Auto-generates a timer id that's guaranteed not to have been used by anyone else.
 			If the timer with that id has already been set then this discards the old information.
 			@param when Time in seconds in the future to fire the timer
 			@return Timer id
 		 */
-		unsigned int setTimer(double when);
+		unsigned int setTimer(simtime_t when);
 
 		/** Cancel an existing timer set by @b setTimer()
 			If the timer has not been set, or has already fires, this does nothing

base/utils/ModuleAccess.cc

@@ -19,9 +19,9 @@
 
 #include "ModuleAccess.h"
 
-static cModule *findSubmodRecursive(cModule *curmod, const char *name, const char *classname)
+static cModule *findSubmodRecursive(const cModule *curmod, const char *name, const char *classname)
 {
-    for (cSubModIterator i(*curmod); !i.end(); i++)
+    for (cModule::SubmoduleIterator i(curmod); !i.end(); i++)
     {
         cModule *submod = i();
         if (!strcmp(submod->getFullName(), name))

examples/phyLayer/TestPhyLayer.h

@@ -63,8 +63,8 @@ class TestPhyLayer:public BasePhyLayer{
 		int myIndex;
 		std::string myName;
 
-		TestAnalogueModel(std::string name, double attenuation, int myIndex):
-			att(attenuation), myName(name), myIndex(myIndex) {}
+		TestAnalogueModel(std::string name, double attenuation, int index):
+			att(attenuation), myIndex(index), myName(name) {}
 
 		void filterSignal(Signal& s) {
 			log("Filtering signal.");

makemakefiles

@@ -56,7 +56,7 @@ all:
 #	@cd $(ROOT)/base/localization && $(MAKEMAKE) $(OPTS) -n $(IBASE)
 
 	@echo $(ROOT)/modules
-	@cd $(ROOT)/modules && $(MAKEMAKE) $(OPTS) $(MODULES_OPTS) -K MIXIMROOT=$(ROOT) --deep -o libmiximmodules -s -X phy -X channel -X localization -X macOld
+	@cd $(ROOT)/modules && $(MAKEMAKE) $(OPTS) $(MODULES_OPTS) -K MIXIMROOT=$(ROOT) --deep -o libmiximmodules -s -X phy -X channel -X localization
 
 
 #	@echo $(ROOT)/modules

mkmk

@@ -5,11 +5,6 @@
 # set root directory
 ROOT=`pwd`
 
-if [ ! -f omnetppconfig ]; then
-	# make omnetppconfig if it doesn't exist
-	opp_makemake -f --genconfig omnetppconfig
-fi	
-
 # copy lib makefrag for linux
 (cd $ROOT/lib && cp makefrag.linux makefrag)
 

tests/basePhyLayer/TestPhyLayer.cc

@@ -184,8 +184,8 @@ void TestPhyLayer::testInitialisation() {
 	}
 
 	assertTrue("Check attenuation value of AnalogueModels.",
-				FWMath::close(att1, 1.1) && FWMath::close(att2, 2.1)
-				|| FWMath::close(att1, 2.1) && FWMath::close(att2, 1.1));
+				(FWMath::close(att1, 1.1) && FWMath::close(att2, 2.1))
+				|| (FWMath::close(att1, 2.1) && FWMath::close(att2, 1.1)));
 
 	//check initialisation of timers
 	assertNotEqual("Check initialisation of TX-OVER timer", (void*)0, txOverTimer);