[Orxonox-commit 618] r3150 - in branches/pch/src: core core/input network orxonox/overlays util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-06-12 10:58:40 +0200 (Fri, 12 Jun 2009)
New Revision: 3150

Modified:
   branches/pch/src/core/CommandLine.cc
   branches/pch/src/core/input/InputManager.cc
   branches/pch/src/core/input/InputState.h
   branches/pch/src/network/Host.h
   branches/pch/src/orxonox/overlays/OverlayText.cc
   branches/pch/src/util/Clipboard.cc
Log:
Build fixes (X11 defines the None macro...)

Modified: branches/pch/src/core/CommandLine.cc
===================================================================
--- branches/pch/src/core/CommandLine.cc	2009-06-12 08:17:44 UTC (rev 3149)
+++ branches/pch/src/core/CommandLine.cc	2009-06-12 08:58:40 UTC (rev 3150)
@@ -29,6 +29,8 @@
 #include "CommandLine.h"
 
 #include <boost/filesystem.hpp>
+
+#include "util/Exception.h"
 #include "util/String.h"
 #include "util/SubString.h"
 #include "Core.h"

Modified: branches/pch/src/core/input/InputManager.cc
===================================================================
--- branches/pch/src/core/input/InputManager.cc	2009-06-12 08:17:44 UTC (rev 3149)
+++ branches/pch/src/core/input/InputManager.cc	2009-06-12 08:58:40 UTC (rev 3150)
@@ -40,17 +40,12 @@
 #include <ois/OISException.h>
 #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"
 
 #include "InputBuffer.h"
@@ -60,6 +55,11 @@
 #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
 {
     SetConsoleCommand(InputManager, calibrate, true);

Modified: branches/pch/src/core/input/InputState.h
===================================================================
--- branches/pch/src/core/input/InputState.h	2009-06-12 08:17:44 UTC (rev 3149)
+++ branches/pch/src/core/input/InputState.h	2009-06-12 08:58:40 UTC (rev 3150)
@@ -90,11 +90,11 @@
     protected:
         InputState()
             : bHandlersChanged_(false)
+            , executorOnEnter_(0)
+            , executorOnLeave_(0)
             , priority_(0)
             , bAlwaysGetsInput_(false)
             , bTransparent_(false)
-            , executorOnEnter_(0)
-            , executorOnLeave_(0)
         { }
         virtual ~InputState() { }
 

Modified: branches/pch/src/network/Host.h
===================================================================
--- branches/pch/src/network/Host.h	2009-06-12 08:17:44 UTC (rev 3149)
+++ branches/pch/src/network/Host.h	2009-06-12 08:58:40 UTC (rev 3150)
@@ -35,7 +35,7 @@
 
 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;
 

Modified: branches/pch/src/orxonox/overlays/OverlayText.cc
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayText.cc	2009-06-12 08:17:44 UTC (rev 3149)
+++ branches/pch/src/orxonox/overlays/OverlayText.cc	2009-06-12 08:58:40 UTC (rev 3150)
@@ -42,9 +42,9 @@
 {
     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)
         : OrxonoxOverlay(creator)

Modified: branches/pch/src/util/Clipboard.cc
===================================================================
--- branches/pch/src/util/Clipboard.cc	2009-06-12 08:17:44 UTC (rev 3149)
+++ branches/pch/src/util/Clipboard.cc	2009-06-12 08:58:40 UTC (rev 3150)
@@ -128,7 +128,7 @@
         @brief Default implementation if there is no OS-specific implementation or no clipboard. Gets the text from the internal clipboard.
         @return The text
     */
-    const std::string& fromClipboard()
+    std::string fromClipboard()
     {
         return clipboard;
     }