From f6b81bf19f1e9c5a6299516f030623bd41a73e56 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 22 Nov 2006 16:18:06 +0000 Subject: Enclose any 'using std::string' statements within qpid namespaces to avoid pollution of global namespaces. Explicit use of std::string in many places, especially for client APIs where not already done. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478212 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/client/Connection.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/client/Connection.h') diff --git a/cpp/src/qpid/client/Connection.h b/cpp/src/qpid/client/Connection.h index edb7e0e974..340ebe9a0f 100644 --- a/cpp/src/qpid/client/Connection.h +++ b/cpp/src/qpid/client/Connection.h @@ -61,8 +61,8 @@ class Connection : public virtual qpid::framing::InputHandler, volatile bool closed; void channelException(Channel* channel, qpid::framing::AMQMethodBody* body, QpidError& e); - void error(int code, const string& msg, int classid = 0, int methodid = 0); - void closeChannel(Channel* channel, u_int16_t code, string& text, u_int16_t classId = 0, u_int16_t methodId = 0); + void error(int code, const std::string& msg, int classid = 0, int methodid = 0); + void closeChannel(Channel* channel, u_int16_t code, std::string& text, u_int16_t classId = 0, u_int16_t methodId = 0); void sendAndReceive(qpid::framing::AMQFrame* frame, const qpid::framing::AMQMethodBody& body); virtual void handleMethod(qpid::framing::AMQMethodBody::shared_ptr body); -- cgit v1.2.1