diff options
| author | Alan Conway <aconway@apache.org> | 2006-10-24 13:29:05 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-10-24 13:29:05 +0000 |
| commit | 6920d8261ca0cdbb7e547a756a32dfd067cd15bc (patch) | |
| tree | 981846eb1ebf8070a3fc654faf1e4e4f5f42c050 /cpp/src/qpid/framing/FieldTable.h | |
| parent | 0a453564f9624bf4c0ce98194691be9ff0184e2b (diff) | |
| download | qpid-python-6920d8261ca0cdbb7e547a756a32dfd067cd15bc.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/framing/FieldTable.h')
| -rw-r--r-- | cpp/src/qpid/framing/FieldTable.h | 9 |
1 files changed, 4 insertions, 5 deletions
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; |