Changeset 6919 for source/ariba/utility/system

Timestamp:

Nov 13, 2009, 1:41:34 PM (15 years ago)

Author:

mies

Message:

Fixed tons of warnings when using CXXFLAGS="-Wall"!

Location:

source/ariba/utility/system

Files:

• SystemEvent.h (modified) (4 diffs)
• SystemQueue.cpp (modified) (1 diff)
• SystemQueue.h (modified) (2 diffs)

source/ariba/utility/system/SystemEvent.h

@@ -59 +59 @@
         const void* data; //< data attached to the event
 
-public: 
+public:
         // TODO: these should be private, but the gcc 3.4 in scratchbox for cross-compiling
         // for Maemo (Nokia N810) gets confused when the friend class SystemQueue has a 
@@ -66 +66 @@
         uint32_t delayTime; //< time the event is scheduled at, or 0 if it is to be fired immediately
         uint32_t remainingDelay; //< remaining delay time for sleeping
-        
+
 public:
-        inline SystemEvent(
-                        SystemEventListener* mlistener,
-                        SystemEventType mtype = SystemEventType::DEFAULT,
-                        void* mdata = NULL)
-                        :       scheduledTime(boost::posix_time::not_a_date_time),
-                                delayTime(0),
-                                remainingDelay(0),
-                                listener(mlistener),
-                                type(mtype),
-                                data(mdata) {
+        inline SystemEvent(SystemEventListener* mlistener, SystemEventType mtype =
+                        SystemEventType::DEFAULT, void* mdata = NULL) :
+                listener(mlistener), type(mtype), data(mdata), scheduledTime(
+                                boost::posix_time::not_a_date_time), delayTime(0),
+                                remainingDelay(0)
+
+        {
         }
 
         template<typename T>
-        inline SystemEvent( SystemEventListener* mlistener,
-                        SystemEventType mtype = SystemEventType::DEFAULT,
-                        T* mdata = NULL)
-                                :       scheduledTime(boost::posix_time::not_a_date_time),
-                                        delayTime(0),
-                                        remainingDelay(0),
-                                        listener(mlistener),
-                                        type(mtype),
-                                        data((void*)mdata) {
+        inline SystemEvent(SystemEventListener* mlistener, SystemEventType mtype =
+                        SystemEventType::DEFAULT, T* mdata = NULL) :
+                listener(mlistener), type(mtype), data((void*) mdata), scheduledTime(
+                                boost::posix_time::not_a_date_time), delayTime(0),
+                                remainingDelay(0) {
         }
-
-
 
         inline SystemEvent(const SystemEvent& copy) {
@@ -126 +117 @@
         template<typename T>
         inline T* getData() const {
-                return (T*)*this;
+                return (T*) *this;
         }
 
@@ -147 +138 @@
 };
 
-}} // spovnet, common
+}
+} // spovnet, common
 
 #endif /* SYSTEMEVENT_H_ */

source/ariba/utility/system/SystemQueue.cpp

@@ -125 +125 @@
 
 SystemQueue::QueueThread::QueueThread(QueueThread* _transferQueue)
-        : running( false ), transferQueue( _transferQueue ) {
+        : transferQueue( _transferQueue ), running( false ) {
 }
 

source/ariba/utility/system/SystemQueue.h

@@ -234 +234 @@
 #ifdef UNDERLAY_OMNET
 
+#if 0
         //
         // the system queue must be a singleton in simulations, too.
@@ -243 +244 @@
         // this is the macro definition from macros.h
         //
-        // #define Define_Module(CLASSNAME) \
-        //   static cModule *CLASSNAME##__create() {return new CLASSNAME();} \
+        // #define Define_Module(CLASSNAME) /backslash
+        //   static cModule *CLASSNAME##__create() {return new CLASSNAME();} /backslash
         //   EXECUTE_ON_STARTUP(CLASSNAME##__mod, modtypes.instance()->add(new cModuleType(#CLASSNAME,#CLASSNAME,(ModuleCreateFunc)CLASSNAME##__create));)
         //
         // and this is how we do it :)
         //
+#endif
 
         static cModule* SystemQueue__create() {