Solved problems when compiling with C++11 active

Sebastiano Merlino · Sebastiano Merlino · commit 28d48b96b0f1 · 2014-03-08T21:38:54.000Z
diff --git a/configure.ac b/configure.ac
@@ -121,18 +121,18 @@ if test x"have_gnutls" = x"yes"; then
 fi
 
 AC_MSG_CHECKING([whether to use c++0x std classes])
-AC_ARG_ENABLE([cpp0x],
-              [AS_HELP_STRING([--enable-cpp0x],
-              [enable c++0x std classes (def=no)])],
-              [cpp0x="$enableval"],
-              [cpp0x=no])
-AC_MSG_RESULT([$cpp0x])
-
-if test x"$cpp0x" = x"yes"; then
-    AC_DEFINE([CPP0X],[],[c++0x Mode])
-    AM_CXXFLAGS="$AM_CXXFLAGS -DUSE_CPP_ZEROX -std=c++0x"
+AC_ARG_ENABLE([cpp11],
+              [AS_HELP_STRING([--enable-cpp11],
+              [enable c++11 std classes (def=no)])],
+              [cpp11="$enableval"],
+              [cpp11=no])
+AC_MSG_RESULT([$cpp11])
+
+if test x"$cpp11" = x"yes"; then
+    AC_DEFINE([CPP11],[],[c++11 Mode])
+    AM_CXXFLAGS="$AM_CXXFLAGS -DUSE_CPP_11 --std=c++11"
 else
-    AC_DEFINE([NCPP0X],[],[standard Mode])
+    AC_DEFINE([NCPP11],[],[standard Mode])
 fi
 
 DX_HTML_FEATURE(ON)
@@ -176,5 +176,5 @@ AC_MSG_NOTICE([Configuration Summary:
   License         :  LGPL only
   Debug	          :  ${debugit}
   TLS Enabled     :  ${have_gnutls}
-  C++0x           :  ${cpp0x}
+  C++11           :  ${cpp11}
 ])
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -33,11 +33,7 @@
 #include <cstring>
 #include <map>
 #include <vector>
-#ifdef USE_CPP_ZEROX
-#include <unordered_set>
-#else
 #include <set>
-#endif
 #include <string>
 #include <utility>
 #include <memory>
@@ -235,13 +231,8 @@ class webserver
         std::map<std::string, details::cache_entry*> response_cache;
         int next_to_choose;
         pthread_rwlock_t cache_guard;
-#ifdef USE_CPP_ZEROX
-        std::unordered_set<http::ip_representation> bans;
-        std::unordered_set<http::ip_representation> allowances;
-#else
         std::set<http::ip_representation> bans;
         std::set<http::ip_representation> allowances;
-#endif
 
         std::map<http::httpserver_ska, std::deque<std::string> > q_messages;
         std::map<std::string, std::set<http::httpserver_ska> > q_waitings;
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -250,7 +250,7 @@ bool webserver::register_resource(
     details::http_endpoint idx(resource, family, true, regex_checking);
 
     pair<map<details::http_endpoint, details::http_resource_mirror>::iterator, bool> result = registered_resources.insert(
-        pair<details::http_endpoint, details::http_resource_mirror>(idx, hrm)
+        map<details::http_endpoint, details::http_resource_mirror>::value_type(idx, hrm)
     );
 
     if(result.second)
@@ -1414,7 +1414,7 @@ void webserver::register_to_topics(
         struct timeval curtime;
         gettimeofday(&curtime, NULL);
         q_keepalives[connection_id] = curtime.tv_sec;
-        q_keepalives_mem[connection_id] = make_pair<int, string>(
+        q_keepalives_mem[connection_id] = make_pair(
                 keepalive_secs, keepalive_msg
         );
     }
@@ -1425,7 +1425,7 @@ void webserver::register_to_topics(
         pthread_mutex_init(&m, NULL);
         pthread_cond_init(&c, NULL);
         q_blocks[connection_id] =
-            std::make_pair<pthread_mutex_t, pthread_cond_t>(m, c);
+            std::make_pair(m, c);
     }
     pthread_rwlock_unlock(&comet_guard);
 }
