Author: gsim
Date: Wed Nov 22 08:18:06 2006
New Revision: 478212
URL: http://svn.apache.org/viewvc?view=rev&rev=478212
Log:
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.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h
incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp
incubator/qpid/trunk/qpid/cpp/test/client/echo_service.cpp
incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h Wed Nov 22 08:18:06
2006
@@ -48,6 +48,8 @@
namespace qpid {
namespace broker {
+ using qpid::framing::string;
+
/**
* Maintains state for an AMQP channel. Handles incoming and
* outgoing messages for that channel.
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp Wed Nov 22
08:18:06 2006
@@ -22,6 +22,7 @@
#include <qpid/broker/Channel.h>
using namespace qpid::broker;
+using std::string;
DeliveryRecord::DeliveryRecord(Message::shared_ptr _msg,
Queue::shared_ptr _queue,
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h Wed Nov 22
08:18:06 2006
@@ -38,12 +38,12 @@
class DeliveryRecord{
mutable Message::shared_ptr msg;
mutable Queue::shared_ptr queue;
- string consumerTag;
+ std::string consumerTag;
u_int64_t deliveryTag;
bool pull;
public:
- DeliveryRecord(Message::shared_ptr msg, Queue::shared_ptr queue,
const string consumerTag, const u_int64_t deliveryTag);
+ DeliveryRecord(Message::shared_ptr msg, Queue::shared_ptr queue,
const std::string consumerTag, const u_int64_t deliveryTag);
DeliveryRecord(Message::shared_ptr msg, Queue::shared_ptr queue,
const u_int64_t deliveryTag);
void discard(TransactionContext* ctxt = 0) const;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h Wed Nov 22
08:18:06 2006
@@ -28,15 +28,17 @@
namespace qpid {
namespace broker {
+ using std::string;
+
class Exchange{
- const std::string name;
+ const string name;
public:
typedef boost::shared_ptr<Exchange> shared_ptr;
- explicit Exchange(const std::string& _name) : name(_name){}
+ explicit Exchange(const string& _name) : name(_name){}
virtual ~Exchange(){}
- std::string getName() { return name; }
- virtual std::string getType() = 0;
+ string getName() { return name; }
+ virtual string getType() = 0;
virtual void bind(Queue::shared_ptr queue, const string&
routingKey, qpid::framing::FieldTable* args) = 0;
virtual void unbind(Queue::shared_ptr queue, const string&
routingKey, qpid::framing::FieldTable* args) = 0;
virtual void route(Deliverable& msg, const string& routingKey,
qpid::framing::FieldTable* args) = 0;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h Wed Nov 22
08:18:06 2006
@@ -30,13 +30,13 @@
struct UnknownExchangeTypeException{};
class ExchangeRegistry{
- typedef std::map<string, Exchange::shared_ptr> ExchangeMap;
+ typedef std::map<std::string, Exchange::shared_ptr> ExchangeMap;
ExchangeMap exchanges;
qpid::sys::Mutex lock;
public:
- std::pair<Exchange::shared_ptr, bool> declare(const string& name,
const string& type) throw(UnknownExchangeTypeException);
- void destroy(const string& name);
- Exchange::shared_ptr get(const string& name);
+ std::pair<Exchange::shared_ptr, bool> declare(const std::string& name,
const std::string& type) throw(UnknownExchangeTypeException);
+ void destroy(const std::string& name);
+ Exchange::shared_ptr get(const std::string& name);
Exchange::shared_ptr getDefault();
};
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Wed Nov 22 08:18:06
2006
@@ -32,7 +32,8 @@
namespace qpid {
namespace broker {
-
+
+ using qpid::framing::string;
/**
* Represents an AMQP message, i.e. a header body, a list of
* content bodies and some details about the publication
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h Wed Nov 22
08:18:06 2006
@@ -57,7 +57,7 @@
* distributed transaction in which the operation takes
* place or null for 'local' transactions
*/
- virtual void enqueue(TransactionContext* ctxt,
Message::shared_ptr& msg, const Queue& queue, const string * const xid) = 0;
+ virtual void enqueue(TransactionContext* ctxt,
Message::shared_ptr& msg, const Queue& queue, const std::string * const xid) =
0;
/**
* Dequeues a message, recording that the given message is
* no longer on the given queue and deleting the message
@@ -69,15 +69,15 @@
* distributed transaction in which the operation takes
* place or null for 'local' transactions
*/
- virtual void dequeue(TransactionContext* ctxt,
Message::shared_ptr& msg, const Queue& queue, const string * const xid) = 0;
+ virtual void dequeue(TransactionContext* ctxt,
Message::shared_ptr& msg, const Queue& queue, const std::string * const xid) =
0;
/**
* Treat all enqueue/dequeues where this xid was specified as
being committed.
*/
- virtual void committed(const string * const xid) = 0;
+ virtual void committed(const std::string * const xid) = 0;
/**
* Treat all enqueue/dequeues where this xid was specified as
being aborted.
*/
- virtual void aborted(const string * const xid) = 0;
+ virtual void aborted(const std::string * const xid) = 0;
virtual ~MessageStore(){}
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Wed Nov 22 08:18:06
2006
@@ -40,6 +40,7 @@
*/
struct ExclusiveAccessException{};
+ using std::string;
/**
* The brokers representation of an amqp queue. Messages are
* delivered to a queue from where they can be dispatched to
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h Wed Nov 22
08:18:06 2006
@@ -33,8 +33,8 @@
public:
RecoveryManager(QueueRegistry& queues, ExchangeRegistry& exchanges);
~RecoveryManager();
- Queue::shared_ptr recoverQueue(const string& name);
- Exchange::shared_ptr recoverExchange(const string& name, const string&
type);
+ Queue::shared_ptr recoverQueue(const std::string& name);
+ Exchange::shared_ptr recoverExchange(const std::string& name, const
std::string& type);
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h Wed Nov 22
08:18:06 2006
@@ -46,9 +46,9 @@
class Prepare{
TransactionContext* ctxt;
Message::shared_ptr& msg;
- const string* const xid;
+ const std::string* const xid;
public:
- Prepare(TransactionContext* ctxt, Message::shared_ptr& msg,
const string* const xid);
+ Prepare(TransactionContext* ctxt, Message::shared_ptr& msg,
const std::string* const xid);
void operator()(Queue::shared_ptr& queue);
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h Wed Nov 22 08:18:06
2006
@@ -47,7 +47,7 @@
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;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Wed Nov 22
08:18:06 2006
@@ -61,8 +61,8 @@
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);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h Wed Nov 22
08:18:06 2006
@@ -50,10 +50,10 @@
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);
};
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h Wed Nov 22 08:18:06
2006
@@ -30,7 +30,7 @@
class Message{
qpid::framing::AMQHeaderBody::shared_ptr header;
- string data;
+ std::string data;
bool redelivered;
u_int64_t deliveryTag;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h Wed Nov 22
08:18:06 2006
@@ -33,6 +33,13 @@
#ifndef AMQP_TYPES_H
#define AMQP_TYPES_H
+namespace qpid
+{
+namespace framing
+{
+
using std::string;
+}
+}
#endif
Modified: incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp Wed Nov 22
08:18:06 2006
@@ -30,6 +30,7 @@
using namespace qpid::client;
using namespace qpid::sys;
+using std::string;
class SimpleListener : public virtual MessageListener{
Monitor* monitor;
Modified: incubator/qpid/trunk/qpid/cpp/test/client/echo_service.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/client/echo_service.cpp?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/test/client/echo_service.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/test/client/echo_service.cpp Wed Nov 22
08:18:06 2006
@@ -30,6 +30,7 @@
using namespace qpid::client;
using namespace qpid::sys;
+using std::string;
class EchoServer : public MessageListener{
Channel* const channel;
Modified: incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp Wed Nov 22
08:18:06 2006
@@ -30,6 +30,7 @@
using namespace qpid::client;
using namespace qpid::sys;
+using std::string;
class Listener : public MessageListener{
Channel* const channel;
Modified: incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp?view=diff&rev=478212&r1=478211&r2=478212
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp Wed Nov 22
08:18:06 2006
@@ -32,6 +32,7 @@
using namespace qpid::client;
using namespace qpid::sys;
+using std::string;
class Publisher : public MessageListener{
Channel* const channel;
