QPID-52: use of tr1 and unordered_map break build or RHEL4.

Replaced unordered_map with std::map.
Use boost::shared_ptr instead of std::tr1::shared_ptr. Since we're 
using boost for other things now anyway it's simpler & more portable.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@467329 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 6 deletions

diff --git a/cpp/src/qpid/broker/TopicExchange.h b/cpp/src/qpid/broker/TopicExchange.h
index 29772f5bce..d6c1946e71 100644
--- a/cpp/src/qpid/broker/TopicExchange.h
+++ b/cpp/src/qpid/broker/TopicExchange.h
@@ -18,7 +18,7 @@
 #ifndef _TopicExchange_
 #define _TopicExchange_
 
-#include <tr1/unordered_map>
+#include <map>
 #include <vector>
 #include "qpid/broker/Exchange.h"
 #include "qpid/framing/FieldTable.h"
@@ -37,13 +37,14 @@ class Tokens : public std::vector<std::string> {
 
     /** Tokenize s, provides automatic conversion of string to Tokens */
     Tokens(const std::string& s) { operator=(s); }
-    /** Tokenize s */
+    /** Tokenizing assignment operator s */
     Tokens & operator=(const std::string& s);
-
-    struct Hash { size_t operator()(const Tokens&) const; };
-    typedef std::equal_to<Tokens> Equal;
+    
+  private:
+    size_t hash;
 };
 
+        
 /**
  * Tokens that have been normalized as a pattern and can be matched
  * with topic Tokens.  Normalized meands all sequences of mixed * and
@@ -68,7 +69,7 @@ class TopicPattern : public Tokens
 };
 
 class TopicExchange : public virtual Exchange{
-    typedef std::tr1::unordered_map<TopicPattern, Queue::vector, TopicPattern::Hash> BindingMap;
+    typedef std::map<TopicPattern, Queue::vector> BindingMap;
     BindingMap bindings;
     qpid::concurrent::MonitorImpl lock;