Changeset 8689 for code/branches/unity_build

Timestamp:

May 30, 2011, 6:59:50 PM (14 years ago)

Author:

rgrieder

Message:

Fixed GCC build and warnings.

Location:

code/branches/unity_build/src/libraries

Files:

• core/GUIManager.h (modified) (1 diff)
• util/tribool.h (modified) (1 diff)

code/branches/unity_build/src/libraries/core/GUIManager.h

@@ -115 +115 @@
 
         //! 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_; }

code/branches/unity_build/src/libraries/util/tribool.h

@@ -27 +27 @@
  * \brief Keyword for the dontcare tribool value
  */
-const dontcare_keyword_t dontcare;
+const dontcare_keyword_t dontcare = dontcare_keyword_t();
 
 /**