Changeset 1744 for code/branches

Timestamp:

Sep 8, 2008, 6:47:51 PM (16 years ago)

Author:

rgrieder

Message:

gcc doesn't like ellipsis, replaced it with a template

File:

• code/branches/core3/src/util/Convert.h (modified) (4 diffs)

code/branches/core3/src/util/Convert.h

@@ -77 +77 @@
 struct TemplateDebugger
 {
-    static int debug(int c, int d) { BOOST_STATIC_ASSERT(0); }
+    static int debug(int c, int d) { return 0; } //BOOST_STATIC_ASSERT(0); }
 };
 
@@ -100 +100 @@
         // We have to make sure noboy uses it, so a good compiler error would be nice.
         *output = (AnyToType)input; // Do not use this function!
-        BOOST_STATIC_ASSERT(0); // just to be sure
+        //BOOST_STATIC_ASSERT(0); // just to be sure
+                return *(new conversionTests::VeryBigStruct());
     }
 }
@@ -118 +119 @@
     private:
         static VerySmallStruct test(ToType); // only accepts ToType, but is preferred over '...'
-        static VeryBigStruct   test(...);    // accepts anything
+                template <class AnyType>
+        static VeryBigStruct   test(const AnyType anything);    // accepts anything
         static FromType object; // helper object to handle private c'tor and d'tor
     public:
@@ -357 +359 @@
         // convert from const char* via std::string
         static bool convert(ToType* output, const char* input)
-        { return Converter<ToType, std::string>::convert(output, input); }
+        { return Converter<ToType, std::string, Dummy>::convert(output, input); }
     };
 #if 0