svn commit: r796833 - /qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp

[shuston]

Author: shuston
Date: Wed Jul 22 19:04:34 2009
New Revision: 796833

URL: http://svn.apache.org/viewvc?rev=796833&view=rev
Log:
Replace TRUE with _TRUE, FALSE with _FALSE to avoid macro conflicts on Windows 
MSVC

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

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp?rev=796833&r1=796832&r2=796833&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp Wed Jul 22 19:04:34 
2009
@@ -57,8 +57,8 @@
     dtxImpl(s)
 {}
 
-static const std::string TRUE("true");
-static const std::string FALSE("false");
+static const std::string _TRUE("true");
+static const std::string _FALSE("false");
 
 void SessionAdapter::ExchangeHandlerImpl::declare(const string& exchange, 
const string& type, 
                                                   const string& 
alternateExchange, 
@@ -69,8 +69,8 @@
         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, std::string(passive ? TRUE 
: FALSE) ));
-        params.insert(make_pair(acl::PROP_DURABLE, std::string(durable ? TRUE 
: FALSE)));
+        params.insert(make_pair(acl::PROP_PASSIVE, std::string(passive ? _TRUE 
: _FALSE) ));
+        params.insert(make_pair(acl::PROP_DURABLE, std::string(durable ? _TRUE 
: _FALSE)));
         if 
(!acl->authorise(getConnection().getUserId(),acl::ACT_CREATE,acl::OBJ_EXCHANGE,exchange,&params)
 )
             throw NotAllowedException(QPID_MSG("ACL denied exhange declare 
request from " << getConnection().getUserId()));
     }
@@ -327,10 +327,10 @@
     if (acl) {
         std::map<acl::Property, std::string> params;
         params.insert(make_pair(acl::PROP_ALTERNATE, alternateExchange));
-        params.insert(make_pair(acl::PROP_PASSIVE, std::string(passive ? TRUE 
: FALSE) ));
-        params.insert(make_pair(acl::PROP_DURABLE, std::string(durable ? TRUE 
: FALSE)));
-        params.insert(make_pair(acl::PROP_EXCLUSIVE, std::string(exclusive ? 
TRUE : FALSE)));
-        params.insert(make_pair(acl::PROP_AUTODELETE, std::string(autoDelete ? 
TRUE : FALSE)));
+        params.insert(make_pair(acl::PROP_PASSIVE, std::string(passive ? _TRUE 
: _FALSE) ));
+        params.insert(make_pair(acl::PROP_DURABLE, std::string(durable ? _TRUE 
: _FALSE)));
+        params.insert(make_pair(acl::PROP_EXCLUSIVE, std::string(exclusive ? 
_TRUE : _FALSE)));
+        params.insert(make_pair(acl::PROP_AUTODELETE, std::string(autoDelete ? 
_TRUE : _FALSE)));
         if 
(!acl->authorise(getConnection().getUserId(),acl::ACT_CREATE,acl::OBJ_QUEUE,name,&params)
 )
             throw NotAllowedException(QPID_MSG("ACL denied queue create 
request from " << getConnection().getUserId()));
     }



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