Changeset 3192 for code/branches/pch/src/util

Timestamp:

Jun 18, 2009, 10:00:15 AM (16 years ago)

Author:

rgrieder

Message:

Replaced <OgrePrerequisites.h> with "util/OgreForwardRefs.h": I haven't yet realised that OgrePrerequisites.h includes about every single std header by including the OgreMemoryManager.h file.
And while at it, I took care of some type conversions (partially revealed by the missing OgrePrerequisites.h that disabled warnings)

Location:

code/branches/pch/src/util

Files:

• Convert.h (modified) (3 diffs)
• Math.h (modified) (2 diffs)
• OgreForwardRefs.h (added)

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

@@ -307 +307 @@
     {
         return ConverterExplicit<FromType, ToType>::convert(output, input);
-    }
-
-    // For compatibility reasons. The same, but with capital ConvertValue
-    template<class FromType, class ToType>
-    FORCEINLINE bool ConvertValue(ToType* output, const FromType& input)
-    {
-        return convertValue(output, input);
     }
 
@@ -372 +365 @@
     FORCEINLINE std::string convertToString(FromType value)
     {
-      return getConvertedValue<FromType, std::string>(value);
+        return getConvertedValue<FromType, std::string>(value);
     }
 
@@ -379 +372 @@
     FORCEINLINE ToType convertFromString(std::string str)
     {
-      return getConvertedValue<std::string, ToType>(str);
+        return getConvertedValue<std::string, ToType>(str);
     }
 

code/branches/pch/src/util/Math.h

@@ -229 +229 @@
     inline float rnd()
     {
-        return rand() / (RAND_MAX + 1.0);
+        return rand() / (RAND_MAX + 1.0f);
     }
 
@@ -256 +256 @@
     inline float rndsgn()
     {
-        return ((rand() & 0x2) - 1); // rand() & 0x2 is either 2 or 0
+        return static_cast<float>((rand() & 0x2) - 1); // rand() & 0x2 is either 2 or 0
     }