Changeset 5133 in orxonox.OLD for trunk/src

Timestamp:

Aug 26, 2005, 11:42:42 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: made the Functor-List external

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• defs/functor_list.h (added)
• util/loading/load_param.h (modified) (1 diff)

trunk/src/Makefile.am

@@ -142 +142 @@
                  defs/compiler.h \
                  defs/class_id.h \
+                 defs/functor_list.h \
                  lib/coord/p_node.h \
                  lib/coord/null_parent.h \

trunk/src/Makefile.in

@@ -402 +402 @@
                  defs/compiler.h \
                  defs/class_id.h \
+                 defs/functor_list.h \
                  lib/coord/p_node.h \
                  lib/coord/null_parent.h \

trunk/src/util/loading/load_param.h

@@ -356 +356 @@
 
 
-  //! makes functions with one string loadable
-  LoadParam1(l_STRING);
-  //! makes functions with two strings loadable
-  LoadParam2(l_STRING, l_STRING);
-  //! makes functions with three strings loadable
-  LoadParam3(l_STRING, l_STRING, l_STRING);
-  //! makes functions with four strings loadable
-  LoadParam4(l_STRING, l_STRING, l_STRING, l_STRING);
-
-  //! makes functions with one bool loadeable
-  LoadParam1(l_BOOL);
-
-  //! makes functions with one int loadable
-  LoadParam1(l_INT);
-  //! makes functions with two ints loadable
-  LoadParam2(l_INT, l_INT);
-  //! makes functions with three ints loadable
-  LoadParam3(l_INT, l_INT, l_INT);
-  //! makes functions with four ints loadable
-  LoadParam4(l_INT, l_INT, l_INT, l_INT);
-
-
-  //! makes functions with one unsigned int loadable
-  LoadParam1(l_UINT);
-  //! makes functions with two unsigned ints loadable
-  LoadParam2(l_UINT, l_UINT);
-  //! makes functions with three unsigned ints loadable
-  LoadParam3(l_UINT, l_UINT, l_UINT);
-  //! makes functions with four unsigned ints loadable
-  LoadParam4(l_UINT, l_UINT, l_UINT, l_UINT);
-
-  //! makes functions with one float loadable
-  LoadParam1(l_FLOAT);
-  //! makes functions with two floats loadable
-  LoadParam2(l_FLOAT, l_FLOAT);
-  //! makes functions with three floats loadable
-  LoadParam3(l_FLOAT, l_FLOAT, l_FLOAT);
-  //! makes functions with four floats loadable
-  LoadParam4(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT);
-  //! makes functions with four floats loadable
-  LoadParam5(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT);
-
-  //! mixed values:
-  LoadParam2(l_STRING, l_FLOAT);
+#define FUNCTOR_LIST(x)    LoadParam ## x
+#include "functor_list.h"
+#undef FUNCTOR_LIST
 
   //! makes functions with one Vector loadable