From ec1fbccb4d7b461882aadee167d8a96b2e501c0a Mon Sep 17 00:00:00 2001 From: Ralf Grillenberger Date: Fri, 29 Oct 2010 21:18:44 +0000 Subject: [PATCH] GCC compilation and test for empty string fix related to the config patch. Thanks TeaRex and ripsaw8080 for reporting. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3652 --- include/cross.h | 2 +- src/misc/programs.cpp | 4 ++-- src/misc/setup.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/cross.h b/include/cross.h index 8e2268d1..697cb6ee 100644 --- a/include/cross.h +++ b/include/cross.h @@ -74,7 +74,7 @@ public: static void CreatePlatformConfigDir(std::string& in); static void ResolveHomedir(std::string & temp_line); static void CreateDir(std::string const& temp); - static bool Cross::IsPathAbsolute(std::string const& in); + static bool IsPathAbsolute(std::string const& in); }; diff --git a/src/misc/programs.cpp b/src/misc/programs.cpp index 724d6a9b..21f378f1 100644 --- a/src/misc/programs.cpp +++ b/src/misc/programs.cpp @@ -459,10 +459,10 @@ void CONFIG::Run(void) { std::string propvalues; std::vector pv = p->GetValues(); - if (p->Get_type()==Value::Etype::V_BOOL) { + if (p->Get_type()==Value::V_BOOL) { // possible values for boolean are true, false propvalues += "true, false"; - } else if (p->Get_type()==Value::Etype::V_INT) { + } else if (p->Get_type()==Value::V_INT) { // print min, max for integer values if used Prop_int* pint = dynamic_cast (p); if (pint==NULL) E_Exit("Int property dynamic cast failed."); diff --git a/src/misc/setup.cpp b/src/misc/setup.cpp index a0184b49..f62034f0 100644 --- a/src/misc/setup.cpp +++ b/src/misc/setup.cpp @@ -995,7 +995,7 @@ int CommandLine::GetParameterFromList(const char* const params[], std::vector