From 6920d8261ca0cdbb7e547a756a32dfd067cd15bc Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 24 Oct 2006 13:29:05 +0000 Subject: 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 --- cpp/src/qpid/client/Channel.cpp | 2 +- cpp/src/qpid/client/Connection.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/client') diff --git a/cpp/src/qpid/client/Channel.cpp b/cpp/src/qpid/client/Channel.cpp index 99e827488c..4d994f0510 100644 --- a/cpp/src/qpid/client/Channel.cpp +++ b/cpp/src/qpid/client/Channel.cpp @@ -21,7 +21,7 @@ #include "qpid/client/Message.h" #include "qpid/QpidError.h" -using namespace std::tr1;//to use dynamic_pointer_cast +using namespace boost; //to use dynamic_pointer_cast using namespace qpid::client; using namespace qpid::framing; using namespace qpid::concurrent; diff --git a/cpp/src/qpid/client/Connection.cpp b/cpp/src/qpid/client/Connection.cpp index 779480eae9..b20df92e9b 100644 --- a/cpp/src/qpid/client/Connection.cpp +++ b/cpp/src/qpid/client/Connection.cpp @@ -68,7 +68,7 @@ void Connection::open(const std::string& _host, int _port, const std::string& ui responses.receive(connection_tune); - ConnectionTuneBody::shared_ptr proposal = std::tr1::dynamic_pointer_cast(responses.getResponse()); + ConnectionTuneBody::shared_ptr proposal = boost::dynamic_pointer_cast(responses.getResponse()); out->send(new AMQFrame(0, new ConnectionTuneOkBody(proposal->getChannelMax(), max_frame_size, proposal->getHeartbeat()))); u_int16_t heartbeat = proposal->getHeartbeat(); @@ -86,7 +86,7 @@ void Connection::open(const std::string& _host, int _port, const std::string& ui //ok }else if(responses.validate(connection_redirect)){ //ignore for now - ConnectionRedirectBody::shared_ptr redirect(std::tr1::dynamic_pointer_cast(responses.getResponse())); + ConnectionRedirectBody::shared_ptr redirect(boost::dynamic_pointer_cast(responses.getResponse())); std::cout << "Received redirection to " << redirect->getHost() << std::endl; }else{ THROW_QPID_ERROR(PROTOCOL_ERROR, "Bad response"); -- cgit v1.2.1