Changeset 1746 for code/branches/core3

Timestamp:

Sep 9, 2008, 12:36:31 AM (16 years ago)

Author:

rgrieder

Message:

Gcc detected a few typos.

Location:

code/branches/core3/src/util

Files:

• Convert.h (modified) (3 diffs)
• Math.cc (modified) (1 diff)

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

@@ -153 +153 @@
     };
 
-    template <int asdf>
-    class ExplicitConversion<float, int, asdf>
-    {
-    private:
-        static float objectFromType; // helper object to handle private c'tor and d'tor
-        static int   objectToType;   // helper object to handle private c'tor and d'tor
-    public:
-        enum { exists = sizeof(explicitConversion(&objectToType, objectFromType)) == sizeof(VerySmallStruct) };
-        static void test() { TemplateDebugger<sizeof(explicitConversion(&objectToType, objectFromType)), sizeof(VerySmallStruct)>::debug(1,2); }
-    };
+    //template <int asdf>
+    //class ExplicitConversion<float, int, asdf>
+    //{
+    //private:
+    //    static float objectFromType; // helper object to handle private c'tor and d'tor
+    //    static int   objectToType;   // helper object to handle private c'tor and d'tor
+    //public:
+    //    enum { exists = sizeof(explicitConversion(&objectToType, objectFromType)) == sizeof(VerySmallStruct) };
+    //    static void test() { TemplateDebugger<sizeof(explicitConversion(&objectToType, objectFromType)), sizeof(VerySmallStruct)>::debug(1,2); }
+    //};
 
     // checks for conversion via istringstream
@@ -239 +239 @@
 ///////////////////////
 
-// template that is used when no explicit template specialisation is available
-template <class ToType, class FromType>
-struct ConverterSpecialised
-{
-    static bool convert(ToType* output, const FromType& input)
-    {
-        // check for explicit conversion via function overloading
-        return conversion::convert(output, input,
-            conversion::ExplicitPossible<ExplicitConversion<FromType, ToType>::exists>());
-    }
-};
-
 namespace conversion
 {
@@ -271 +259 @@
         //return ConverterSpecialised<ToType, FromType>::convert(output, input);
     }
-
-
+}
+
+// template that is used when no explicit template specialisation is available
+template <class ToType, class FromType>
+struct ConverterSpecialised
+{
+    static bool convert(ToType* output, const FromType& input)
+    {
+        // check for explicit conversion via function overloading
+        return conversion::convert(output, input,
+            conversion::ExplicitPossible<ExplicitConversion<FromType, ToType>::exists>());
+    }
+};
+
+namespace conversion
+{
     /////////////////
     //Implicit Cast//

code/branches/core3/src/util/Math.cc

@@ -233 +233 @@
     return false;
 }
+