Changeset 1021 for code/trunk/src/orxonox/OrxonoxPlatform.h

Timestamp:

Apr 10, 2008, 5:03:34 PM (16 years ago)

Author:

bknecht

Message:

merged back that script-branch

File:

• code/trunk/src/orxonox/OrxonoxPlatform.h (modified) (3 diffs)

code/trunk/src/orxonox/OrxonoxPlatform.h

@@ -210 +210 @@
 //#   pragma warning (disable : 4503)
 
-// disable: "conversion from 'double' to 'float', possible loss of data
+// disable: conversion from 'double' to 'float', possible loss of data
+// disable: conversion from 'ogg_int64_t' to 'long', possible loss of data
+// This has been dealt with in base_properties of the solution since the
+// warning primarily occurs in library header files (which are mostly
+// included before OrxonoxPlatform.h is)
 //#   pragma warning (disable : 4244)
 
@@ -221 +225 @@
 // disable: "<type> needs to have dll-interface to be used by clients'
 // Happens on STL member variables which are not public therefore is ok
+// This has been dealt with in base_properties of the solution since the
+// warning primarily occurs in library header files (which are mostly
+// included before OrxonoxPlatform.h is)
 //#   pragma warning (disable : 4251)
+
+// disable: 'MultiTypeString' : multiple assignment operators specified
+// Used in MultiType and works fine so far
+#   pragma warning (disable : 4522)
 
 // disable: "non dll-interface class used as base for dll-interface class"
@@ -252 +263 @@
 
 
-// Create a logical xor operator
+// Define the english written operators like and, or, xor
 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
-#  define XOR ^
-#elif ORXONOX_COMPILER == ORXONOX_COMPILER_GCC
-#  define XOR xor
-#else
-#  define XOR ^
+#  include <iso646.h>
 #endif