qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1072905 - /qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
Date Mon, 21 Feb 2011 09:35:26 GMT
Author: gsim
Date: Mon Feb 21 09:35:26 2011
New Revision: 1072905

URL: http://svn.apache.org/viewvc?rev=1072905&view=rev
Log:
QPID-3015: Rename string constants to avoid clashes on windows

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1072905&r1=1072904&r2=1072905&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Mon Feb 21 09:35:26 2011
@@ -508,8 +508,8 @@ const std::string EXCHANGE_TYPE("exchang
 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
     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> Br
         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,&params)
)
             throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied exchange create
request from " << userId));
     }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message