Changeset 8676

Timestamp:

May 30, 2011, 12:22:19 AM (14 years ago)

Author:

rgrieder

Message:

Fixed MSVC warnings in Convert.h in a different fashion that doesn't require CMake code.

Location:

code/branches/unity_build/src/libraries/util

Files:

• CMakeLists.txt (modified) (1 diff)
• Convert.h (modified) (2 diffs)

code/branches/unity_build/src/libraries/util/CMakeLists.txt

@@ -42 +42 @@
 )
 
-IF(MSVC)
-  # Simply using #pragma warning(disable:4244) doesn't really disable it
-  # if the warning occurs in a template in another file
-  # Hence promote it manually to a higher warning level (4)
-  SET_SOURCE_FILES_PROPERTIES(MultiType.cc PROPERTIES COMPILE_FLAGS "-w44244")
-ENDIF()
-
 ORXONOX_ADD_LIBRARY(util
   FIND_HEADER_FILES

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

@@ -133 +133 @@
 #include "ImplicitConversion.h"
 
+// disable warnings about possible loss of data
+#ifdef ORXONOX_COMPILER_MSVC
+#  pragma warning(push)
+#  pragma warning(disable:4244)
+#endif
+
 namespace orxonox
 {
@@ -471 +477 @@
 }
 
+// Reinstate warnings
+#ifdef ORXONOX_COMPILER_MSVC
+#  pragma warning(pop)
+#endif
+
 #endif /* _Convert_H__ */