got rid of the STD_SHARED_XX std/tr1 defines

src/common/conf_post.h

@@ -1,10 +1,3 @@
-#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
-#define MEMORY_INCLUDE <memory>
-#define STD_SHARED_PTR    std::shared_ptr
-
 
 #ifdef _WIN32
 #include "safewindows.h"

src/common/rclconfig.h

@@ -23,7 +23,7 @@
 #include <set>
 #include <utility>
 #include <map>
-#include UNORDERED_SET_INCLUDE
+#include <unordered_set>
 
 using std::string;
 using std::vector;
@@ -378,10 +378,10 @@ class RclConfig {
     static string o_localecharset;
     // Limiting set of mime types to be processed. Normally empty.
     ParamStale    m_rmtstate;
-    STD_UNORDERED_SET<string>   m_restrictMTypes; 
+    std::unordered_set<string>   m_restrictMTypes; 
     // Exclusion set of mime types. Normally empty
     ParamStale    m_xmtstate;
-    STD_UNORDERED_SET<string>   m_excludeMTypes; 
+    std::unordered_set<string>   m_excludeMTypes; 
 
     vector<pair<int, int> > m_thrConf;
 

src/common/syngroups.cpp

@@ -23,7 +23,7 @@
 #include "smallut.h"
 
 #include <errno.h>
-#include UNORDERED_MAP_INCLUDE
+#include <unordered_map>
 #include <fstream>
 #include <iostream>
 #include <cstring>
@@ -46,7 +46,7 @@ public:
     }
     bool ok;
     // Term to group num 
-    STD_UNORDERED_MAP<string, unsigned int> terms;
+    std::unordered_map<string, unsigned int> terms;
     // Group num to group
     vector<vector<string> > groups;
 };
@@ -170,7 +170,7 @@ vector<string> SynGroups::getgroup(const string& term)
     if (!ok())
 	return ret;
 
-    STD_UNORDERED_MAP<string, unsigned int>::const_iterator it1 =
+    std::unordered_map<string, unsigned int>::const_iterator it1 =
         m->terms.find(term);
     if (it1 == m->terms.end()) {
 	LOGDEB1("SynGroups::getgroup: ["  << (term) << "] not found in direct map\n" );

src/common/textsplit.cpp

@@ -24,7 +24,7 @@
 #include <string>
 #include <algorithm>
 #include <cstring>
-#include UNORDERED_SET_INCLUDE
+#include <unordered_set>
 
 #include "textsplit.h"
 #include "log.h"
@@ -62,9 +62,9 @@ static int charclasses[charclasses_size];
 // management of Unicode properties, but seems to do the job well
 // enough in most common cases
 static vector<unsigned int> vpuncblocks;
-static STD_UNORDERED_SET<unsigned int> spunc;
-static STD_UNORDERED_SET<unsigned int> visiblewhite;
-static STD_UNORDERED_SET<unsigned int> sskip;
+static std::unordered_set<unsigned int> spunc;
+static std::unordered_set<unsigned int> visiblewhite;
+static std::unordered_set<unsigned int> sskip;
 
 class CharClassInit {
 public: