From 4e838de2b933643881106567b1efcd3c806c6557 Mon Sep 17 00:00:00 2001
From: wyy <wuyanyi09@gmail.com>
Date: Thu, 7 Nov 2013 04:36:36 -0800
Subject: [PATCH] make cmakefile to compatiable with g++-4.6 and 4.7

---
 CMakeLists.txt              |  1 +
 src/Husky/ServerFrame.cpp   |  2 +-
 src/Limonp/map_functs.hpp   | 75 +------------------------------------
 src/Limonp/std_outbound.hpp |  6 +--
 4 files changed, 7 insertions(+), 77 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8983dc2..fd7a59e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,2 +1,3 @@
 PROJECT(CPPJIEBA)
+ADD_DEFINITIONS(-std=c++0x -O3)
 ADD_SUBDIRECTORY(src)
diff --git a/src/Husky/ServerFrame.cpp b/src/Husky/ServerFrame.cpp
index aa3eab9..2672e64 100644
--- a/src/Husky/ServerFrame.cpp
+++ b/src/Husky/ServerFrame.cpp
@@ -213,7 +213,7 @@ namespace Husky
         addrSock.sin_port=htons(nPort);
         addrSock.sin_addr.s_addr=htonl(INADDR_ANY);
         int retval;
-        retval=bind(sock,(sockaddr*)&addrSock,sizeof(sockaddr));
+        retval = ::bind(sock,(sockaddr*)&addrSock,sizeof(sockaddr));
         if(SOCKET_ERROR==retval)
         {
             LogError("error [%s]", strerror(errno));
diff --git a/src/Limonp/map_functs.hpp b/src/Limonp/map_functs.hpp
index 44d472c..747f130 100644
--- a/src/Limonp/map_functs.hpp
+++ b/src/Limonp/map_functs.hpp
@@ -12,84 +12,13 @@
 #include <iostream>
 #include <sstream>
 
-#include <tr1/unordered_map>
-#define HashMap std::tr1::unordered_map
+#include <unordered_map>
+#define HashMap std::unordered_map
 
 namespace Limonp
 {
     using namespace std;
 
-
-    //template <typename T>
-    //    string setToString(const set<T>& st)
-    //    {
-    //        if(st.empty())
-    //        {
-    //            return "{}";
-    //        }
-    //        stringstream ss;
-    //        ss<<'{';
-    //        typename set<T>::const_iterator it = st.begin();
-    //        ss<<*it;
-    //        it++;
-    //        while(it != st.end())
-    //        {
-    //            ss<<", "<<*it;
-    //            it++;
-    //        }
-    //        ss<<'}';
-    //        return ss.str();
-    //    }
-
-    //template<typename T1, typename T2>
-    //    string mapToString(const map<T1, T2>& mp)
-    //    {
-    //        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();
-    //    }
-
-    //template<typename T1, typename T2>
-    //    string HashMapToString(const HashMap<T1, T2>& mp)
-    //    {
-    //        if(mp.empty())
-    //        {
-    //            return "{}";
-    //        }
-    //        stringstream ss;
-    //        ss<<'{';
-    //        typename HashMap<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();
-    //    }
-    //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>
         vT getMap(const map<kT, vT>& mp, const kT & key, const vT & defaultVal)
         {
diff --git a/src/Limonp/std_outbound.hpp b/src/Limonp/std_outbound.hpp
index ab3e5c3..0085704 100644
--- a/src/Limonp/std_outbound.hpp
+++ b/src/Limonp/std_outbound.hpp
@@ -1,7 +1,7 @@
 #ifndef LIMONP_STD_OUTBOUND_H
 #define LIMONP_STD_OUTBOUND_H
 
-#include <tr1/unordered_map>
+#include "map_functs.hpp"
 #include <map>
 #include <set>
 
@@ -59,14 +59,14 @@ namespace std
             return os;
         }
     template<class T1, class T2>
-        ostream& operator << (ostream& os, const std::tr1::unordered_map<T1, T2>& mp)
+        ostream& operator << (ostream& os, const HashMap<T1, T2>& mp)
         {
             if(mp.empty())
             {
                 return os << "{}";
             }
             os<<'{';
-            typename std::tr1::unordered_map<T1, T2>::const_iterator it = mp.begin();
+            typename HashMap<T1, T2>::const_iterator it = mp.begin();
             os<<*it;
             it++;
             while(it != mp.end())