Changeset 1768 for code/branches/core3/src/util/Convert.h

Timestamp:

Sep 11, 2008, 4:40:01 PM (16 years ago)

Author:

rgrieder

Message:

gcc test commit again

File:

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

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

@@ -50 +50 @@
 #endif
 
-///////////////////////////////////
-// Explicit Conversion Functions //
-///////////////////////////////////
-
-
 ///////////////////////////////////////////////
 // Static detection for conversion functions //
@@ -96 +91 @@
             return *(new conversionTests::VeryBigStruct());
     }
-}
-
-namespace conversionTests
-{
-    // Part of the msvc hack. See above in the namespace for more explanations.
-    using namespace separate_namespace;
 
     // These operators simply accept anything but have lower priority than specialisations
@@ -111 +100 @@
     template <class Any>
     conversionTests::VeryBigStruct operator>>(std::istream& instream,  const Any anything);
+}
+
+namespace conversionTests
+{
+    // Part of the msvc hack. See above in the namespace for more explanations.
+    using namespace separate_namespace;
 
     template <class FromType, class ToType>
@@ -144 +139 @@
     {
         IStringStreamOperator(); IStringStreamOperator(const IStringStreamOperator&); ~IStringStreamOperator();
-        static std::istringstream istream_; // helper object to perform the '>>' operation
+        static std::istream istream_; // helper object to perform the '>>' operation
         static Type object;                 // helper object to handle private c'tor and d'tor
     public:
@@ -154 +149 @@
     {
         OStringStreamOperator(); OStringStreamOperator(const OStringStreamOperator&); ~OStringStreamOperator();
-        static std::ostringstream ostream_; // helper object to perform the '<<' operation
+        static std::ostream ostream_; // helper object to perform the '<<' operation
         static Type object;                 // helper object to handle private c'tor and d'tor
     public:
@@ -169 +164 @@
     Usage: ImplicitConversion<FromType, ToType>::exists
 */
-template <class FromType, class ToType>
-struct ImplicitConversion
-{ enum { exists = conversionTests::ImplicitConversion<FromType, ToType>::exists }; };
+//template <class FromType, class ToType>
+//struct ImplicitConversion
+//{ enum { exists = conversionTests::asdf::ImplicitConversion<FromType, ToType>::exists }; };
 
 /**
@@ -179 +174 @@
     Usage: ExplicitConversion<FromType, ToType>::exists
 */
-template <class FromType, class ToType>
-struct ExplicitConversion
-{ enum { exists = conversionTests::ExplicitConversion<FromType, ToType>::exists }; };
+//template <class FromType, class ToType>
+//struct ExplicitConversion
+//{ enum { exists = conversionTests::asdf::ExplicitConversion<FromType, ToType>::exists }; };
 
 /**
@@ -189 +184 @@
     Usage: IStringStreamConversion<FromType, ToType>::exists
 */
-template <class Type>
-struct IStringStreamOperator
-{ enum { exists = conversionTests::IStringStreamOperator<Type>::exists }; };
+//template <class Type>
+//struct IStringStreamOperator
+//{ enum { exists = conversionTests::asdf::IStringStreamOperator<Type>::exists }; };
 
 /**
@@ -199 +194 @@
     Usage: OStringStreamConversion<FromType, ToType>::exists
 */
-template <class Type>
-struct OStringStreamOperator
-{ enum { exists = conversionTests::OStringStreamOperator<Type>::exists }; };
+//template <class Type>
+//struct OStringStreamOperator
+//{ enum { exists = conversionTests::asdf::OStringStreamOperator<Type>::exists }; };
 
 
@@ -286 +281 @@
         static bool convert(std::string* output, const FromType& input)
         {
-            const bool probe = OStringStreamOperator<FromType>::exists;
+            const bool probe = conversionTests::OStringStreamOperator<FromType>::exists;
             return convert(output, input, StringStreamPossible<probe>());
         }
@@ -328 +323 @@
         static bool convert(ToType* output, const std::string& input)
         {
-            const bool probe = IStringStreamOperator<ToType>::exists;
+            const bool probe = conversionTests::IStringStreamOperator<ToType>::exists;
             return convert(output, input, StringStreamPossible<probe>());
         }
@@ -381 +376 @@
     inline bool convert(ToType* output, const FromType& input, ExplicitPossible<false>)
     {
-        const bool probe = ImplicitConversion<FromType, ToType>::exists;
+        const bool probe = conversionTests::ImplicitConversion<FromType, ToType>::exists;
         return convert(output, input, ImplicitPossible<probe>());
     }
@@ -398 +393 @@
     {
         // check for explicit conversion via function overloading
-        const bool probe = ExplicitConversion<FromType, ToType>::exists;
+        const bool probe = conversionTests::ExplicitConversion<FromType, ToType>::exists;
         return conversion::convert(output, input, conversion::ExplicitPossible<probe>());
     }