From 7da84582f6c87bff9d28e2fb66d544c94e175840 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Wed, 31 Oct 2007 11:37:38 +0000 Subject: [PATCH] Fix PropertyEditorString when compiling with g++ 3.4. (name the wanted explicitly) Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3030 --- src/gui/sdl_gui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/sdl_gui.cpp b/src/gui/sdl_gui.cpp index cc745dbc..e91d4154 100644 --- a/src/gui/sdl_gui.cpp +++ b/src/gui/sdl_gui.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: sdl_gui.cpp,v 1.1 2007-10-28 16:36:41 qbix79 Exp $ */ +/* $Id: sdl_gui.cpp,v 1.2 2007-10-31 11:37:38 qbix79 Exp $ */ #include "SDL.h" #include "../libs/gui_tk/gui_tk.h" @@ -304,7 +304,7 @@ public: bool prepare(std::string &buffer) { if (input->getText() == GUI::String(prop->GetValue()._string)) return false; - buffer.append((const std::string&)input->getText()); + buffer.append(static_cast(input->getText())); return true; } };