Changeset 3150

Timestamp:

Jun 12, 2009, 10:58:40 AM (15 years ago)

Author:

rgrieder

Message:

Build fixes (X11 defines the None macro…)

Location:

code/branches/pch/src

Files:

• core/CommandLine.cc (modified) (1 diff)
• core/input/InputManager.cc (modified) (2 diffs)
• core/input/InputState.h (modified) (1 diff)
• network/Host.h (modified) (1 diff)
• orxonox/overlays/OverlayText.cc (modified) (1 diff)
• util/Clipboard.cc (modified) (1 diff)

code/branches/pch/src/core/CommandLine.cc

@@ -30 +30 @@
 
 #include <boost/filesystem.hpp>
+
+#include "util/Exception.h"
 #include "util/String.h"
 #include "util/SubString.h"

code/branches/pch/src/core/input/InputManager.cc

@@ -41 +41 @@
 #include <ois/OISInputManager.h>
 
-// HACK
-#ifdef ORXONOX_PLATFORM_LINUX
-#  include <ois/linux/LinuxMouse.h>
-#endif
-
 #include "util/Exception.h"
 #include "util/Debug.h"
-#include "core/ConsoleCommand.h"
 #include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/ConsoleCommand.h"
 #include "core/CommandLine.h"
 
@@ -60 +55 @@
 #include "ExtendedInputState.h"
 #include "JoyStickDeviceNumberListener.h"
+
+// HACK (include this as last, X11 seems to define some macros...)
+#ifdef ORXONOX_PLATFORM_LINUX
+#  include <ois/linux/LinuxMouse.h>
+#endif
 
 namespace orxonox

code/branches/pch/src/core/input/InputState.h

@@ -91 +91 @@
         InputState()
             : bHandlersChanged_(false)
+            , executorOnEnter_(0)
+            , executorOnLeave_(0)
             , priority_(0)
             , bAlwaysGetsInput_(false)
             , bTransparent_(false)
-            , executorOnEnter_(0)
-            , executorOnLeave_(0)
         { }
         virtual ~InputState() { }

code/branches/pch/src/network/Host.h

@@ -36 +36 @@
 namespace orxonox {
 
-  const int CLIENTID_SERVER = 0;
+  const unsigned int CLIENTID_SERVER = 0;
   const unsigned int NETWORK_FREQUENCY = 30;
   const float NETWORK_PERIOD = 1.0f/NETWORK_FREQUENCY;

code/branches/pch/src/orxonox/overlays/OverlayText.cc

@@ -43 +43 @@
     CreateFactory(OverlayText);
 
-    BOOST_STATIC_ASSERT(Ogre::TextAreaOverlayElement::Left   == OverlayText::Left);
-    BOOST_STATIC_ASSERT(Ogre::TextAreaOverlayElement::Center == OverlayText::Center);
-    BOOST_STATIC_ASSERT(Ogre::TextAreaOverlayElement::Right  == OverlayText::Right);
+    BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Left   == (int)OverlayText::Left);
+    BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Center == (int)OverlayText::Center);
+    BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Right  == (int)OverlayText::Right);
 
     OverlayText::OverlayText(BaseObject* creator)

code/branches/pch/src/util/Clipboard.cc

@@ -129 +129 @@
         @return The text
     */
-    const std::string& fromClipboard()
+    std::string fromClipboard()
     {
         return clipboard;