From 100e39e6e079fb40bc960b5b3ccdb4a169787574 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Sat, 12 Jun 2010 19:49:00 +0000
Subject: [PATCH] - bugfix so code compiles on older gnuc

---
 source/glest_game/global/config.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/source/glest_game/global/config.h b/source/glest_game/global/config.h
index 9990995f..bfac6ccd 100644
--- a/source/glest_game/global/config.h
+++ b/source/glest_game/global/config.h
@@ -14,6 +14,7 @@
 
 #include "properties.h"
 #include <vector>
+//#include <utility>
 #include "game_constants.h"
 
 namespace Glest{ namespace Game{
@@ -36,11 +37,6 @@ enum ConfigType {
 
 class Config {
 private:
-	//Properties properties;
-	//ConfigType cfgType;
-	//string fileName;
-	//bool fileLoaded;
-
 	std::pair<Properties,Properties> properties;
 	std::pair<ConfigType,ConfigType> cfgType;
 	std::pair<string,string> fileName;
@@ -54,9 +50,9 @@ private:
 	char translateStringToCharKey(const string &value) const;
 
 public:
-    static Config &getInstance(std::pair<ConfigType,ConfigType> type = std::pair<ConfigType,ConfigType>(cfgMainGame,cfgUserGame),
-							   std::pair<string,string> file = std::pair<string,string>("glest.ini","glestuser.ini"),
-							   std::pair<bool,bool> fileMustExist = std::pair<bool,bool>(true,false));
+    static Config &getInstance(std::pair<ConfigType,ConfigType> type = std::make_pair(cfgMainGame,cfgUserGame) ,
+				std::pair<string,string> file = std::make_pair("glest.ini","glestuser.ini") ,
+				std::pair<bool,bool> fileMustExist = std::make_pair(true,false) );
 	void save(const string &path="");
 
 	int getInt(const string &key,const char *defaultValueIfNotFound=NULL) const;