Changeset 2797 for code/trunk/src/orxonox/gamestates

Timestamp:

Mar 17, 2009, 10:53:53 PM (16 years ago)

Author:

landauf

Message:

Added some #ifndef's around #define NOMINMAX and #define FORCEINLINE to avoid "symbol redefined" compiler-warnings.

Reto, I hope this doesn't cause any troubles. If it does, I suggest using "#undef symbolname" instead of "#ifndef symbolname". This should then work basically as before, but without warnings.

Location:

code/trunk/src/orxonox/gamestates

Files:

• GSGraphics.h (modified) (1 diff)
• GSRoot.cc (modified) (1 diff)

code/trunk/src/orxonox/gamestates/GSGraphics.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include <OgrePrerequisites.h>
-#define NOMINMAX // required to stop windows.h screwing up std::min definition
+#ifndef NOMINMAX
+#  define NOMINMAX // required to stop windows.h screwing up std::min definition
+#endif
 #include <OgreWindowEventUtilities.h>
 #include "core/GameState.h"

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -49 +49 @@
 #    define WIN32_LEAN_AND_MEAN
 #  endif
-#  define NOMINMAX // required to stop windows.h screwing up std::min definition
+#  ifndef NOMINMAX
+#    define NOMINMAX // required to stop windows.h screwing up std::min definition
+#  endif
 #  include "windows.h"
 #endif