[Orxonox-commit 4015] r8689 - in code/branches/unity_build/src/libraries: core util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-30 18:59:50 +0200 (Mon, 30 May 2011)
New Revision: 8689

Modified:
   code/branches/unity_build/src/libraries/core/GUIManager.h
   code/branches/unity_build/src/libraries/util/tribool.h
Log:
Fixed GCC build and warnings.

Modified: code/branches/unity_build/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/unity_build/src/libraries/core/GUIManager.h	2011-05-30 16:51:00 UTC (rev 8688)
+++ code/branches/unity_build/src/libraries/core/GUIManager.h	2011-05-30 16:59:50 UTC (rev 8689)
@@ -114,7 +114,7 @@
         static bool inDevMode(void); // tolua_export
 
         //! Creates a new InputState to be used with a GUI Sheet
-        const std::string& createInputState(const std::string& name, tribool showCursor = true, tribool useKeyboard = true, bool bBlockJoyStick = false); // tolua_export
+        const std::string& createInputState(const std::string& name, tribool showCursor = tribool(true), tribool useKeyboard = tribool(true), bool bBlockJoyStick = false); // tolua_export
         LuaState* getLuaState(void)
             { return this->luaState_; }
 

Modified: code/branches/unity_build/src/libraries/util/tribool.h
===================================================================
--- code/branches/unity_build/src/libraries/util/tribool.h	2011-05-30 16:51:00 UTC (rev 8688)
+++ code/branches/unity_build/src/libraries/util/tribool.h	2011-05-30 16:59:50 UTC (rev 8689)
@@ -26,7 +26,7 @@
 /**
  * \brief Keyword for the dontcare tribool value
  */
-const dontcare_keyword_t dontcare;
+const dontcare_keyword_t dontcare = dontcare_keyword_t();
 
 /**
  * \brief A 3-state boolean type.