From 8f06d1340adb0332527bae7b455c05041ed91403 Mon Sep 17 00:00:00 2001
From: gwdwyy <wuyanyi09@gmail.com>
Date: Sun, 18 Aug 2013 23:06:18 +0800
Subject: [PATCH] update cppcommon

---
 src/cppcommon/argv_functs.cpp |  5 ++--
 src/cppcommon/argv_functs.h   |  2 +-
 src/cppcommon/map_functs.h    | 48 ++++++++++++++++++++---------------
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/cppcommon/argv_functs.cpp b/src/cppcommon/argv_functs.cpp
index 5ddf55c..8b7d17f 100644
--- a/src/cppcommon/argv_functs.cpp
+++ b/src/cppcommon/argv_functs.cpp
@@ -54,11 +54,11 @@ namespace CPPCOMMON
 	{
 		string res;
 		res += string_format("[%s]\n", joinStr(_args, ", ").c_str());
-		res += jsonMPSS(_mpss);
+		res += mapToString<string, string>(_mpss);
 		return res;
 	}
 
-	string ArgvContext::operator [](int i)
+	string ArgvContext::operator [](uint i)
 	{
 		if(i < _args.size())
 		{
@@ -93,6 +93,7 @@ int main(int argc, char** argv)
 	cout<<arg.toString()<<endl;
 	cout<<arg[1]<<endl;
 	cout<<arg["--hehe"]<<endl;
+	cout<<pairToString<int,double>(pair<int, double>(1,1.2))<<endl;
 	return 0;
 }
 
diff --git a/src/cppcommon/argv_functs.h b/src/cppcommon/argv_functs.h
index 824462a..9b63ad1 100644
--- a/src/cppcommon/argv_functs.h
+++ b/src/cppcommon/argv_functs.h
@@ -20,7 +20,7 @@ namespace CPPCOMMON
 			~ArgvContext();
 		public:
 			string toString();
-			string operator [](int i);
+			string operator [](uint i);
 			string operator [](const string& key);
 		private:
 			vector<string> _args;
diff --git a/src/cppcommon/map_functs.h b/src/cppcommon/map_functs.h
index 6a6707d..f7775bd 100644
--- a/src/cppcommon/map_functs.h
+++ b/src/cppcommon/map_functs.h
@@ -9,35 +9,41 @@
 
 #include <map>
 #include <iostream>
+#include <sstream>
 
 namespace CPPCOMMON
 {
 	using namespace std;
 
-	inline string jsonMPSS(const map<string, string>& mpss)
-	{
-		if(mpss.empty())
+	template<typename T1, typename T2>
+		string mapToString(const map<T1, T2>& mp)
 		{
-			return "{}";
-		}
-		string res("{");
-		map<string, string>::const_iterator it = mpss.begin();
-		res += it->first;
-		res += ": ";
-		res += it->second;
-		it++;
-		while(it != mpss.end())
-		{
-			res += ", ";
-			res += it->first;
-			res += ": ";
-			res += it->second;
+			if(mp.empty())
+			{
+				return "{}";
+			}
+			stringstream ss;
+			ss<<'{';
+			typename map<T1, T2>::const_iterator it = mp.begin();
+			ss<<it->first<<": "<<it->second;
 			it++;
+			while(it != mp.end())
+			{
+				ss<<", "<<it->first<<": "<<it->second;
+				it++;
+			}
+			ss<<"}";
+			return ss.str();
 		}
-		res += "}";
-		return res;
-	}
-	
+
+	template<typename T1, typename T2>
+		string pairToString(const pair<T1, T2>& p)
+		{
+			stringstream ss;
+			ss<<p.first<<":"<<p.second;
+			return ss.str();
+		}
+
 	template<class kT, class vT>
 		void printMap(const map<kT, vT>& mp)
 		{