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

7 files changed, 12 insertions, 13 deletions

diff --git a/cpp/src/qpid/framing/AMQBody.h b/cpp/src/qpid/framing/AMQBody.h
index e9d77225fa..be06e43388 100644
--- a/cpp/src/qpid/framing/AMQBody.h
+++ b/cpp/src/qpid/framing/AMQBody.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "memory.h"
+#include <boost/shared_ptr.hpp>
 #include "qpid/framing/amqp_types.h"
 #include "qpid/framing/Buffer.h"
 
@@ -28,7 +28,7 @@ namespace qpid {
         class AMQBody
         {
           public:
-            typedef std::tr1::shared_ptr<AMQBody> shared_ptr;
+            typedef boost::shared_ptr<AMQBody> shared_ptr;
 
             virtual ~AMQBody();
             virtual u_int32_t size() const = 0;
diff --git a/cpp/src/qpid/framing/AMQContentBody.h b/cpp/src/qpid/framing/AMQContentBody.h
index 40dd8f159c..0aa1325642 100644
--- a/cpp/src/qpid/framing/AMQContentBody.h
+++ b/cpp/src/qpid/framing/AMQContentBody.h
@@ -30,7 +30,7 @@ class AMQContentBody : virtual public AMQBody
     string data;
 
 public:
-    typedef std::tr1::shared_ptr<AMQContentBody> shared_ptr;
+    typedef boost::shared_ptr<AMQContentBody> shared_ptr;
 
     AMQContentBody();
     AMQContentBody(const string& data);
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.h b/cpp/src/qpid/framing/AMQHeaderBody.h
index 4f3804ed75..422a473200 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.h
+++ b/cpp/src/qpid/framing/AMQHeaderBody.h
@@ -34,7 +34,7 @@ class AMQHeaderBody : virtual public AMQBody
 
     void createProperties(int classId);
 public:
-    typedef std::tr1::shared_ptr<AMQHeaderBody> shared_ptr;
+    typedef boost::shared_ptr<AMQHeaderBody> shared_ptr;
 
     AMQHeaderBody(int classId);
     AMQHeaderBody();
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.h b/cpp/src/qpid/framing/AMQHeartbeatBody.h
index 9d4c7d5b1a..34222682e5 100644
--- a/cpp/src/qpid/framing/AMQHeartbeatBody.h
+++ b/cpp/src/qpid/framing/AMQHeartbeatBody.h
@@ -28,7 +28,7 @@ namespace framing {
 class AMQHeartbeatBody : virtual public AMQBody
 {
 public:
-    typedef std::tr1::shared_ptr<AMQHeartbeatBody> shared_ptr;
+    typedef boost::shared_ptr<AMQHeartbeatBody> shared_ptr;
 
     virtual ~AMQHeartbeatBody();
     inline u_int32_t size() const { return 0; }
diff --git a/cpp/src/qpid/framing/AMQMethodBody.h b/cpp/src/qpid/framing/AMQMethodBody.h
index d22c86918c..59b297f19e 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.h
+++ b/cpp/src/qpid/framing/AMQMethodBody.h
@@ -30,7 +30,7 @@ namespace framing {
 class AMQMethodBody : virtual public AMQBody
 {
 public:
-    typedef std::tr1::shared_ptr<AMQMethodBody> shared_ptr;
+    typedef boost::shared_ptr<AMQMethodBody> shared_ptr;
 
     inline u_int8_t type() const { return METHOD_BODY; }
     inline u_int32_t size() const { return 4 + bodySize(); }
diff --git a/cpp/src/qpid/framing/BodyHandler.cpp b/cpp/src/qpid/framing/BodyHandler.cpp
index ddf80b276d..77e68cf313 100644
--- a/cpp/src/qpid/framing/BodyHandler.cpp
+++ b/cpp/src/qpid/framing/BodyHandler.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "memory.h"
+#include <boost/shared_ptr.hpp>
 #include "qpid/framing/BodyHandler.h"
 
 using namespace qpid::framing;
-using namespace std::tr1;
+using namespace boost;
 
 BodyHandler::~BodyHandler() {}
 
diff --git a/cpp/src/qpid/framing/FieldTable.h b/cpp/src/qpid/framing/FieldTable.h
index b48b270895..6b4d9266c1 100644
--- a/cpp/src/qpid/framing/FieldTable.h
+++ b/cpp/src/qpid/framing/FieldTable.h
@@ -17,8 +17,8 @@
  */
 #include <iostream>
 #include <vector>
-#include <tr1/memory>
-#include <tr1/unordered_map>
+#include <boost/shared_ptr.hpp>
+#include <map>
 #include "qpid/framing/amqp_types.h"
 
 #ifndef _FieldTable_
@@ -33,8 +33,8 @@ class Buffer;
 class FieldTable
 {
   public:
-    typedef std::tr1::shared_ptr<Value> ValuePtr;
-    typedef std::tr1::unordered_map<std::string, ValuePtr> ValueMap;
+    typedef boost::shared_ptr<Value> ValuePtr;
+    typedef std::map<std::string, ValuePtr> ValueMap;
 
     ~FieldTable();
     u_int32_t size() const;
@@ -61,7 +61,6 @@ class FieldTable
     const ValueMap& getMap() const { return values; }
     ValueMap& getMap() { return values; }
     
-        
   private:
   friend std::ostream& operator<<(std::ostream& out, const FieldTable& body);
     ValueMap values;