From bd983717de3d4a88899c38d0186f66ecb7054eca Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 15 Sep 2010 22:22:27 +0200
Subject: [PATCH] fixed compile problem (gcc related?)

---
 apps/openmw/mwgui/window_manager.cpp | 4 ++--
 apps/openmw/mwgui/window_manager.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp
index 5997a433b..5138dc841 100644
--- a/apps/openmw/mwgui/window_manager.cpp
+++ b/apps/openmw/mwgui/window_manager.cpp
@@ -178,12 +178,12 @@ void WindowManager::messageBox (const std::string& message, const std::vector<st
     }
 }
 
-const std::string &WindowManager::getGameSettingString(const std::string &id, const std::string &default)
+const std::string &WindowManager::getGameSettingString(const std::string &id, const std::string &default_)
 {
     const ESM::GameSetting *setting = environment.mWorld->getStore().gameSettings.search(id);
     if (setting && setting->type == ESM::VT_String)
         return setting->str;
-    return default;
+    return default_;
 }
 
 void WindowManager::updateCharacterGeneration()
diff --git a/apps/openmw/mwgui/window_manager.hpp b/apps/openmw/mwgui/window_manager.hpp
index 4088a9b63..1f4c333a2 100644
--- a/apps/openmw/mwgui/window_manager.hpp
+++ b/apps/openmw/mwgui/window_manager.hpp
@@ -146,7 +146,7 @@ namespace MWGui
      * @param id Identifier for the GMST setting, e.g. "aName"
      * @param default Default value if the GMST setting cannot be used.
      */
-    const std::string &getGameSettingString(const std::string &id, const std::string &default);
+    const std::string &getGameSettingString(const std::string &id, const std::string &default_);
 
   private:
     void updateCharacterGeneration();