Changeset 5137 in orxonox.OLD for trunk/src/util/shell_command.h

Timestamp:

Aug 26, 2005, 1:41:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better macro-definition

File:

• trunk/src/util/shell_command.h (modified) (3 diffs)

trunk/src/util/shell_command.h

@@ -62 +62 @@
     static bool isRegistered(const char* commandName, ClassID classID, unsigned int paramCount, ...);
 
-
   protected:
     void*                            functionPointer;     //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
@@ -103 +102 @@
     static void unregisterCommand(const char* commandNaame, ClassID classID);
 
-    static void registerCommand(const char* commandName, ClassID classID, void (T::*functionPointer)(), bool isSingleton = false)
+    static void registerCommand(const char* commandName, ClassID classID, void (T::*functionPointer)())
     {
       if (isRegistered(commandName, classID, 0)== true)
@@ -109 +108 @@
       else
       {
-        if (isSingleton == false)
+        if (classID & CL_MASK_SINGLETON == CL_MASK_SINGLETON)
+          new ShellCommandSingleton<T>(commandName, classID, functionPointer);
+        else
           new ShellCommand<T>(commandName, classID, functionPointer);
-        else
-          new ShellCommandSingleton<T>(commandName, classID, functionPointer);
       }
     }