[Gemrb-commits] gemrb: branch master updated. v0.7.2-839-ga7c26b8

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a7c26b88ef65ad91b1804449866fc7648daf0a48 (commit)

Summary of changes:
 gemrb/core/InterfaceConfig.cpp |    9 +++++++--
 gemrb/core/InterfaceConfig.h   |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)
      from  6da9314ac7043bb574184792d195ca73531f2ee7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=a7c26b88ef65ad91b1804449866fc7648daf0a48

commit a7c26b88ef65ad91b1804449866fc7648daf0a48
Author: Brad Allred <bra...@me...>
Date:   Tue Mar 19 22:32:31 2013 -0600

    commenting out unused version of GetValueForKey
    
    should fix msvc builds

diff --git a/gemrb/core/InterfaceConfig.cpp b/gemrb/core/InterfaceConfig.cpp
index f6464e7..fc8f91f 100644
--- a/gemrb/core/InterfaceConfig.cpp
+++ b/gemrb/core/InterfaceConfig.cpp
@@ -24,7 +24,8 @@
 
 #include "System/FileStream.h"
 
-#include <algorithm>
+// needed for unused std::string version of GetValueForKey
+//#include <algorithm>
 
 namespace GemRB {
 
@@ -70,6 +71,10 @@ const char* InterfaceConfig::GetValueForKey(const char* key) const
 	}
 	return value;
 }
+/*
+Currently unused. does not compile under MSVC.
+
+FIXME: if we need this we should consider having one version of GetValueForKey call the other
 
 const std::string* InterfaceConfig::GetValueForKey(std::string* key) const
 {
@@ -83,7 +88,7 @@ const std::string* InterfaceConfig::GetValueForKey(std::string* key) const
 	}
 	return value;
 }
-	
+*/	
 CFGConfig::CFGConfig(int argc, char *argv[])
 	: InterfaceConfig(argc, argv)
 {
diff --git a/gemrb/core/InterfaceConfig.h b/gemrb/core/InterfaceConfig.h
index e80f242..bb2bf80 100644
--- a/gemrb/core/InterfaceConfig.h
+++ b/gemrb/core/InterfaceConfig.h
@@ -40,7 +40,7 @@ public:
 
 	void SetKeyValuePair(const char* key, const char* value);
 	const char* GetValueForKey(const char* key) const;
-	const std::string* GetValueForKey(std::string* key) const;
+	//const std::string* GetValueForKey(std::string* key) const;
 };
 
 // the defacto config class

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator