diff options
| author | Gordon Sim <gsim@apache.org> | 2006-11-22 16:18:06 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2006-11-22 16:18:06 +0000 |
| commit | f6b81bf19f1e9c5a6299516f030623bd41a73e56 (patch) | |
| tree | 50ad4b3e91738c87d18a5e28eebf40e249f5f8df /cpp/src/qpid/client | |
| parent | 6e1582a62b461e389a7b65ca0053e3cc52f3dc27 (diff) | |
| download | qpid-python-f6b81bf19f1e9c5a6299516f030623bd41a73e56.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/client')
| -rw-r--r-- | cpp/src/qpid/client/Channel.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/client/Connection.h | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/client/IncomingMessage.h | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/client/Message.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/qpid/client/Channel.h b/cpp/src/qpid/client/Channel.h index ca32e7ea4d..b2e08f5756 100644 --- a/cpp/src/qpid/client/Channel.h +++ b/cpp/src/qpid/client/Channel.h @@ -47,7 +47,7 @@ namespace client { int count; u_int64_t lastDeliveryTag; }; - typedef std::map<string,Consumer*>::iterator consumer_iterator; + typedef std::map<std::string,Consumer*>::iterator consumer_iterator; u_int16_t id; Connection* con; 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); diff --git a/cpp/src/qpid/client/IncomingMessage.h b/cpp/src/qpid/client/IncomingMessage.h index 352fa9a025..b72c78575e 100644 --- a/cpp/src/qpid/client/IncomingMessage.h +++ b/cpp/src/qpid/client/IncomingMessage.h @@ -50,10 +50,10 @@ namespace client { bool isReturn(); bool isDelivery(); bool isResponse(); - const string& getConsumerTag();//only relevant if isDelivery() + const std::string& getConsumerTag();//only relevant if isDelivery() qpid::framing::AMQHeaderBody::shared_ptr& getHeader(); u_int64_t getDeliveryTag(); - void getData(string& data); + void getData(std::string& data); }; } diff --git a/cpp/src/qpid/client/Message.h b/cpp/src/qpid/client/Message.h index 05667ae221..28e6adc608 100644 --- a/cpp/src/qpid/client/Message.h +++ b/cpp/src/qpid/client/Message.h @@ -30,7 +30,7 @@ namespace client { class Message{ qpid::framing::AMQHeaderBody::shared_ptr header; - string data; + std::string data; bool redelivered; u_int64_t deliveryTag; |