diff options
| author | Gordon Sim <gsim@apache.org> | 2011-02-21 09:35:26 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2011-02-21 09:35:26 +0000 |
| commit | 10e3a051166ebdcb413a43a52b62cea2db725ea5 (patch) | |
| tree | b9b6d71703fd24080988dad9ea6a2f2ed89cfec0 /cpp/src | |
| parent | 81584c84fadc886b0ad53dceb479073e56bf8cdd (diff) | |
| download | qpid-python-10e3a051166ebdcb413a43a52b62cea2db725ea5.tar.gz | |
QPID-3015: Rename string constants to avoid clashes on windows
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1072905 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/broker/Broker.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index 7879989bf0..c5662d763a 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -508,8 +508,8 @@ const std::string EXCHANGE_TYPE("exchange-type"); const std::string QUEUE_NAME("queue"); const std::string EXCHANGE_NAME("exchange"); -const std::string TRUE("true"); -const std::string FALSE("false"); +const std::string _TRUE("true"); +const std::string _FALSE("false"); } struct InvalidBindingIdentifier : public qpid::Exception @@ -772,10 +772,10 @@ std::pair<boost::shared_ptr<Queue>, bool> Broker::createQueue( if (acl) { std::map<acl::Property, std::string> params; params.insert(make_pair(acl::PROP_ALTERNATE, alternateExchange)); - params.insert(make_pair(acl::PROP_PASSIVE, FALSE)); - params.insert(make_pair(acl::PROP_DURABLE, durable ? TRUE : FALSE)); - params.insert(make_pair(acl::PROP_EXCLUSIVE, owner ? TRUE : FALSE)); - params.insert(make_pair(acl::PROP_AUTODELETE, autodelete ? TRUE : FALSE)); + params.insert(make_pair(acl::PROP_PASSIVE, _FALSE)); + params.insert(make_pair(acl::PROP_DURABLE, durable ? _TRUE : _FALSE)); + params.insert(make_pair(acl::PROP_EXCLUSIVE, owner ? _TRUE : _FALSE)); + params.insert(make_pair(acl::PROP_AUTODELETE, autodelete ? _TRUE : _FALSE)); params.insert(make_pair(acl::PROP_POLICYTYPE, arguments.getAsString("qpid.policy_type"))); params.insert(make_pair(acl::PROP_MAXQUEUECOUNT, boost::lexical_cast<string>(arguments.getAsInt("qpid.max_count")))); params.insert(make_pair(acl::PROP_MAXQUEUESIZE, boost::lexical_cast<string>(arguments.getAsInt64("qpid.max_size")))); @@ -850,8 +850,8 @@ std::pair<Exchange::shared_ptr, bool> Broker::createExchange( std::map<acl::Property, std::string> params; params.insert(make_pair(acl::PROP_TYPE, type)); params.insert(make_pair(acl::PROP_ALTERNATE, alternateExchange)); - params.insert(make_pair(acl::PROP_PASSIVE, FALSE)); - params.insert(make_pair(acl::PROP_DURABLE, durable ? TRUE : FALSE)); + params.insert(make_pair(acl::PROP_PASSIVE, _FALSE)); + params.insert(make_pair(acl::PROP_DURABLE, durable ? _TRUE : _FALSE)); if (!acl->authorise(userId,acl::ACT_CREATE,acl::OBJ_EXCHANGE,name,¶ms) ) throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange create request from " << userId)); } |