clean up autoconf of unordered_xx, prepare change to shared_ptr

src/common/autoconfig.h.in

@@ -48,6 +48,12 @@
 /* Define to 1 if you have the `setrlimit' function. */
 #undef HAVE_SETRLIMIT
 
+/* Has std::shared_ptr */
+#undef HAVE_SHARED_PTR_STD
+
+/* Has std::tr1::shared_ptr */
+#undef HAVE_SHARED_PTR_TR1
+
 /* Define to 1 if you have the <spawn.h> header file. */
 #undef HAVE_SPAWN_H
 
@@ -171,3 +177,5 @@
 
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
+
+#include "conf_post.h"

src/common/conf_post.h

@@ -0,0 +1,28 @@
+#ifdef  HAVE_CXX0X_UNORDERED
+#  define UNORDERED_MAP_INCLUDE <unordered_map>
+#  define UNORDERED_SET_INCLUDE <unordered_set>
+#  define STD_UNORDERED_MAP std::unordered_map
+#  define STD_UNORDERED_SET std::unordered_set
+#elif defined(HAVE_TR1_UNORDERED)
+#  define UNORDERED_MAP_INCLUDE <tr1/unordered_map>
+#  define UNORDERED_SET_INCLUDE <tr1/unordered_set>
+#  define STD_UNORDERED_MAP std::tr1::unordered_map
+#  define STD_UNORDERED_SET std::tr1::unordered_set
+#else
+#  define UNORDERED_MAP_INCLUDE <map>
+#  define UNORDERED_SET_INCLUDE <set>
+#  define STD_UNORDERED_MAP std::map
+#  define STD_UNORDERED_SET std::set
+#endif
+
+#ifdef HAVE_SHARED_PTR_STD
+#  define MEMORY_INCLUDE <memory>
+#  define STD_SHARED_PTR    std::shared_ptr
+#elif defined(HAVE_SHARED_PTR_TR1)
+#  define MEMORY_INCLUDE <tr1/memory>
+#  define STD_SHARED_PTR    std::tr1::shared_ptr
+#else
+#  define MEMORY_INCLUDE "refcntr.h"
+#  define STD_SHARED_PTR    RefCntr
+#endif
+

src/common/rclconfig.h

@@ -16,13 +16,14 @@
  */
 #ifndef _RCLCONFIG_H_INCLUDED_
 #define _RCLCONFIG_H_INCLUDED_
+#include "autoconfig.h"
 
 #include <string>
 #include <vector>
 #include <set>
 #include <utility>
 #include <map>
-#include "unordered_defs.h"
+#include UNORDERED_SET_INCLUDE
 
 using std::string;
 using std::vector;
@@ -30,7 +31,6 @@ using std::pair;
 using std::set;
 using std::map;
 
-
 #include "conftree.h"
 #include "smallut.h"
 

src/common/textsplit.cpp

@@ -24,8 +24,7 @@
 #include <string>
 #include <algorithm>
 #include <cstring>
-#include "unordered_defs.h"
-using namespace std;
+#include UNORDERED_SET_INCLUDE
 
 #include "textsplit.h"
 #include "debuglog.h"
@@ -33,6 +32,7 @@ using namespace std;
 #include "utf8iter.h"
 #include "uproplist.h"
 
+using namespace std;
 
 /**
  * Splitting a text into words. The code in this file works with utf-8

src/common/unordered_defs.h

@@ -1,19 +0,0 @@
-
-#include "autoconfig.h"
-
-#ifdef  HAVE_CXX0X_UNORDERED
-#  include <unordered_map>
-#  include <unordered_set>
-#  define STD_UNORDERED_MAP std::unordered_map
-#  define STD_UNORDERED_SET std::unordered_set
-#elif defined(HAVE_TR1_UNORDERED)
-#  include <tr1/unordered_map>
-#  include <tr1/unordered_set>
-#  define STD_UNORDERED_MAP std::tr1::unordered_map
-#  define STD_UNORDERED_SET std::tr1::unordered_set
-#else
-#  include <map>
-#  include <set>
-#  define STD_UNORDERED_MAP std::map
-#  define STD_UNORDERED_SET std::set
-#endif