Changeset 1754 for code

Timestamp:

Sep 9, 2008, 10:25:33 PM (16 years ago)

Author:

rgrieder

Message:

Bugfix that didn't show with msvc.

File:

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

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

@@ -384 +384 @@
         return convert(output, input, ImplicitPossible<probe>());
     }
-
-    // template that is used when no explicit template specialisation is available
-    // try explicitConversion() function next.
-    template <class ToType, class FromType>
-    struct ConverterExplicit
-    {
-        static bool convert(ToType* output, const FromType& input)
-        {
-            // check for explicit conversion via function overloading
-            const bool probe = ExplicitConversion<FromType, ToType>::exists;
-            // why conversion:: ? --> below is a 'using' directive, so this template usually
-            // gets instantiated in global namespace
-            return conversion::convert(output, input, ExplicitPossible<probe>());
-        }
-    };
-}
+}
+
+// We usually don't have a namespace in util/ but it would still be desirable to lock
+// everything internal away in namespace conversion.
+// However this template can be specialised everywhere.
+
+// Template that is used when no explicit template specialisation is available
+// try explicitConversion() function next.
+template <class ToType, class FromType>
+struct ConverterExplicit
+{
+    static bool convert(ToType* output, const FromType& input)
+    {
+        // check for explicit conversion via function overloading
+        const bool probe = ExplicitConversion<FromType, ToType>::exists;
+        return conversion::convert(output, input, conversion::ExplicitPossible<probe>());
+    }
+};
 
 
@@ -405 +407 @@
 // Public Functions //
 //////////////////////
-
-// We usually don't have a namespace in util/ but it would still be desirable to lock
-// everything internal away in namespace conversion.
-using conversion::ConverterExplicit;
 
 /**
@@ -456 +454 @@
 inline ToType getConvertedValue(const FromType& input, const ToType& fallback)
 {
-    ToType output = fallback;
+    ToType output;
     ConvertValue(&output, input, fallback);
     return output;
@@ -475 +473 @@
 inline ToType conversion_cast(const FromType& input, const ToType& fallback)
 {
-    ToType output = fallback;
+    ToType output;
     ConvertValue(&output, input, fallback);
     return output;