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

src/configure.ac

@@ -1,5 +1,6 @@
 AC_INIT([Recoll], m4_esyscmd_s(cat VERSION))
 AC_CONFIG_HEADERS([common/autoconfig.h])
+AH_BOTTOM([#include "conf_post.h"])
 AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR(index/recollindex.cpp)
 
@@ -41,6 +42,21 @@ AC_CHECK_HEADER(tr1/unordered_map,[AC_DEFINE([HAVE_TR1_UNORDERED],
     [],["Have tr1"])],[])
 AC_CHECK_HEADER(unordered_map,[AC_DEFINE([HAVE_CXX0X_UNORDERED],
     [],["Have C++0x"])],[])
+AC_TRY_COMPILE([
+    #include <memory>
+  ],[
+    std::shared_ptr<int> ptr;
+  ], rcl_shared_ptr_std="1", rcl_shared_ptr_std="0")
+AC_TRY_COMPILE([
+    #include <tr1/memory>
+  ],[
+    std::tr1::shared_ptr<int> ptr;
+  ], rcl_shared_ptr_tr1="1", rcl_shared_ptr_tr1="0")
+if test X$rcl_shared_ptr_std = X1; then 
+   AC_DEFINE(HAVE_SHARED_PTR_STD, [], [Has std::shared_ptr])
+elif test X$rcl_shared_ptr_tr1 = X1; then 
+   AC_DEFINE(HAVE_SHARED_PTR_TR1, [], [Has std::tr1::shared_ptr])
+fi
 AC_LANG_POP([C++])
 
 AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/statvfs.h sys/vfs.h], [], [],

src/rcldb/rclabstract.cpp

@@ -19,9 +19,6 @@
 #include <math.h>
 
 #include <map>
-#include "unordered_defs.h"
-
-using namespace std;
 
 #include "debuglog.h"
 #include "rcldb.h"
@@ -33,6 +30,8 @@ using namespace std;
 #include "utf8iter.h"
 #include "hldata.h"
 
+using namespace std;
+
 namespace Rcl {
 // This is used as a marker inside the abstract frag lists, but
 // normally doesn't remain in final output (which is built with a

src/rcldb/rclquery.cpp

@@ -14,6 +14,7 @@
  *   Free Software Foundation, Inc.,
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+#include "autoconfig.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -21,7 +22,6 @@
 
 #include <vector>
 #include <sstream>
-using namespace std;
 
 #include "xapian.h"
 
@@ -37,6 +37,8 @@ using namespace std;
 #include "searchdata.h"
 #include "unacpp.h"
 
+using namespace std;
+
 namespace Rcl {
 // This is used as a marker inside the abstract frag lists, but
 // normally doesn't remain in final output (which is built with a

src/unac/unac.c

@@ -31,7 +31,8 @@
 #include <map>
 #include <string>
 #include <algorithm>
-#include "unordered_defs.h"
+#include UNORDERED_MAP_INCLUDE
+
 using std::string;
 
 #include "smallut.h"

src/utils/refcntr.h

@@ -2,6 +2,7 @@
 #define _REFCNTR_H_
 
 // See Stroustrup C++ 3rd ed, p. 783
+// This is only used if std::shared_ptr is not available
 template <class X> class RefCntr {
     X   *rep;
     int *pcount;

src/utils/smallut.cpp

@@ -16,9 +16,8 @@
  */
 
 #ifndef TEST_SMALLUT
-#ifdef HAVE_CONFIG_H
 #include "autoconfig.h"
-#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -34,14 +33,16 @@
 #include <string>
 #include <iostream>
 #include <list>
-#include "unordered_defs.h"
-using namespace std;
+#include UNORDERED_MAP_INCLUDE
+#include UNORDERED_SET_INCLUDE
 
 #include "smallut.h"
 #include "utf8iter.h"
 #include "hldata.h"
 #include "cstr.h"
 
+using namespace std;
+
 void map_ss_cp_noshr(const map<string,string> s, map<string,string> *d)
 {
     for (map<string,string>::const_iterator it= s.begin();