Changeset 7365 for code/branches/doc/src/libraries/util

Timestamp:

Sep 6, 2010, 2:35:53 PM (14 years ago)

Author:

rgrieder

Message:

Removed obsolete code from Convert.h and replaced last occurrences of getConvertedValue with just two arguments.

File:

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

code/branches/doc/src/libraries/util/Convert.h

@@ -161 +161 @@
         }
     };
-
-    ////////////
-    // upcast //
-    ////////////
-    namespace detail
-    {
-        // perform a static cast if ToType is a base of FromType
-        template<class ToType, class FromType>
-        FORCEINLINE ToType upcast(FromType input, Loki::Int2Type<true>)
-        {
-            return static_cast<ToType>(input);
-        }
-
-        // return zero if ToType is not a base of FromType
-        template<class ToType, class FromType>
-        FORCEINLINE ToType upcast(FromType input, Loki::Int2Type<false>)
-        {
-            return 0;
-        }
-    }
-
-    // performs an upcast if ToType is a base of FromType, returns zero otherwise
-    template <class ToType, class FromType>
-    FORCEINLINE ToType upcast(FromType input)
-    {
-        enum { probe = ImplicitConversion<FromType, ToType>::exists };
-        return detail::upcast<ToType, FromType>(input, Loki::Int2Type<probe>());
-    }
 }
 
@@ -381 +353 @@
     }
 
-    template<class FromType, class ToType>
-    FORCEINLINE ToType getConvertedValue(const FromType& input)
-    {
-        ToType output;
-        convertValue(&output, input);
-        return output;
-    }
-
     /// Directly returns the converted value, but uses the fallback on failure. @see convertValue
     template<class FromType, class ToType>
@@ -443 +407 @@
     /// Conversion would exhibit ambiguous << or >> operators when using iostream
     template <>
-    template <>
     struct ConverterExplicit<unsigned char, std::string>
     {
@@ -453 +416 @@
     };
     /// Conversion would exhibit ambiguous << or >> operators when using iostream
-    template <>
     template <>
     struct ConverterExplicit<std::string, char>