Changeset 7571 for code/branches/ois_update

Timestamp:

Oct 20, 2010, 5:35:10 PM (14 years ago)

Author:

youngk

Message:

Changes to Super.h: Macro collision. Again.

Location:

code/branches/ois_update/src/libraries/core

Files:

• BaseObject.h (modified) (1 diff)
• PathConfig.cc (modified) (1 diff)
• Super.h (modified) (9 diffs)

code/branches/ois_update/src/libraries/core/BaseObject.h

@@ -238 +238 @@
     };
 
+#ifdef csadasdasf
+struct CompilerError
+{
+   void CompilerError() {}
+};
+#endif
+
     template <class T, int templatehack2>
     struct SuperFunctionCondition<0, T, 0, templatehack2>
     {
-        static void verify()
+        static void superCheck()
         {
             SuperFunctionCondition<0, T, 0, templatehack2>::apply(static_cast<T*>(0));
-            SuperFunctionCondition<0 + 1, T, 0, templatehack2>::verify();
+            SuperFunctionCondition<0 + 1, T, 0, templatehack2>::superCheck();
         }
        

code/branches/ois_update/src/libraries/core/PathConfig.cc

@@ -95 +95 @@
 #elif defined(ORXONOX_PLATFORM_APPLE)
         char buffer[1024];
-        unsigned long path_len = 1023;
+        uint32_t path_len = 1023;
         if (_NSGetExecutablePath(buffer, &path_len))
             ThrowException(General, "Could not retrieve executable path.");

code/branches/ois_update/src/libraries/core/Super.h

@@ -94 +94 @@
         struct SuperFunctionCondition<functionnumber, T, 0, templatehack2> \
         { \
-            static void verify() \
+            static void superCheck() \
             { \
                 SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0)); \
-                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::verify(); \
+                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck(); \
             } \
             \
@@ -132 +132 @@
         struct SuperFunctionCondition<functionnumber, baseclass, 0, templatehack2> \
         { \
-            static void verify() \
-            { \
-                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::verify(); \
+            static void superCheck() \
+            { \
+                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::superCheck(); \
             } \
         };
@@ -150 +150 @@
         struct SuperFunctionCondition<functionnumber, T, 0, templatehack2>
         {
-            static void verify()
+            static void superCheck()
             {
                 // This call to the apply-function is the whole check. By calling the function with
@@ -156 +156 @@
                 SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0));
 
-                // Go go the verify for of next super-function (functionnumber + 1)
-                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::verify();
+                // Go go the superCheck for of next super-function (functionnumber + 1)
+                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck();
             }
 
@@ -202 +202 @@
         struct SuperFunctionCondition<functionnumber, baseclass, 0, templatehack2> \
         { \
-            // The verify function acts like the fallback - it advances to the check for the next super-function (functionnumber + 1)
-            static void verify() \
-            { \
-                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::verify(); \
+            // The superCheck function acts like the fallback - it advances to the check for the next super-function (functionnumber + 1)
+            static void superCheck() \
+            { \
+                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::superCheck(); \
             } \
         };
@@ -303 +303 @@
         struct SuperFunctionCondition
         {
-            static void verify() {}
+            static void superCheck() {}
         };
 
@@ -338 +338 @@
             struct SuperFunctionCondition<functionnumber, T, templatehack1, templatehack2> \
             { \
-                static void verify() \
+                static void superCheck() \
                 { \
-                    SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::verify(); \
+                    SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::superCheck(); \
                 } \
             }; \
@@ -421 +421 @@
             // If this function gets called, the header-file of the super function is not
             // included, so this fallback template (templatehack not specialized) is used
-            static void verify()
+            static void superCheck()
             {
                 // Calls the condition-check of the next super-function (functionnumber + 1)
-                SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::verify();
+                SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::superCheck();
             }
         };
@@ -574 +574 @@
         virtual void createSuperFunctionCaller() const
         {
-            //SuperFunctionCondition<0, T, 0, 0>::verify();
+            //SuperFunctionCondition<0, T, 0, 0>::superCheck();
         }