Changeset 960 for code/branches/core2/src/util/Convert.h

Timestamp:

Mar 30, 2008, 4:54:44 PM (17 years ago)

Author:

landauf

Message:

next try

File:

• code/branches/core2/src/util/Convert.h (modified) (2 diffs)

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

@@ -116 +116 @@
 // THE SAME, BUT WITH DEFAULT VALUE
 template<typename FromType, typename ToType>
-static ToType ConvertValueAndReturn(const FromType& input, const FromType& fallback)
-{
-  ToType output;
+static ToType ConvertValueAndReturn(const FromType& input, const ToType& fallback)
+{
+  ToType output = fallback;
   ConvertValue(&output, input, fallback);
   return output;
@@ -541 +541 @@
 };
 
-////////////////////////////////////////////
-// Some specializations to avoid warnings //
-////////////////////////////////////////////
-#define CONVERT_VALUE_AND_RETURN_SPECIALIZATION(ToType) \
-  template<typename FromType> \
-  static ToType ConvertValueAndReturn(const FromType& input) \
-  { \
-    ToType output = 0; \
-    ConvertValue(&output, input); \
-    return output; \
-  }
-
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(void*)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(int)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(unsigned int)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(char)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(unsigned char)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(short)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(unsigned short)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(long)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(unsigned long)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(float)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(double)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(long double)
-CONVERT_VALUE_AND_RETURN_SPECIALIZATION(bool)
-
 #endif /* _Convert_H__ */