svn commit: r709293 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/acl: AclData.cpp AclReader.cpp

[shuston]

Author: shuston
Date: Thu Oct 30 16:41:45 2008
New Revision: 709293

URL: http://svn.apache.org/viewvc?rev=709293&view=rev
Log:
Fix Acl references related to QPID-1368

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp?rev=709293&r1=709292&r2=709293&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp Thu Oct 30 16:41:45 
2008
@@ -71,7 +71,7 @@
                                        for (propertyMapItr pMItr = 
i->props.begin(); (pMItr != i->props.end()) && match; pMItr++)
                                        {
                         //match name is exists first
-                                               if (pMItr->first == acl::NAME){
+                                               if (pMItr->first == 
acl::PROP_NAME){
                                                     if 
(!matchProp(pMItr->second, name)){  
                                                             match= false;
                                                         }
@@ -109,11 +109,11 @@
                                        for (propertyMapItr pMItr = 
i->props.begin(); (pMItr != i->props.end()) && match; pMItr++)
                                        {
                         //match name is exists first
-                                               if (pMItr->first == acl::NAME){
+                                               if (pMItr->first == 
acl::PROP_NAME){
                                                     if 
(!matchProp(pMItr->second, name)){  
                                                             match= false;
                                                         }
-                                               }else if (pMItr->first == 
acl::ROUTINGKEY){
+                                               }else if (pMItr->first == 
acl::PROP_ROUTINGKEY){
                                                     if 
(!matchProp(pMItr->second, RoutingKey)){  
                                                             match= false;
                                                         }

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp?rev=709293&r1=709292&r2=709293&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp Thu Oct 30 
16:41:45 2008
@@ -130,7 +130,7 @@
                                for (int acnt= 
((*i)->actionAll?0:(*i)->action); 
                                         acnt< acl::ACTIONSIZE; 
(*i)->actionAll?acnt++:acnt=acl::ACTIONSIZE )  {
 
-                       if (acnt == acl::PUBLISH) d->transferAcl = true; // we 
have transfer ACL
+                       if (acnt == acl::ACT_PUBLISH) d->transferAcl = true; // 
we have transfer ACL
                                        
                                        QPID_LOG(debug, "ACL Adding action:" << 
AclHelper::getActionStr((Action)acnt) );
 
@@ -414,7 +414,7 @@
             errorStream << ACL_FORMAT_ERR_LOG_PREFIX << "Tokens found after 
action \"all\".";
             return false;
         }
-        action = CONSUME; // dummy; compiler must initialize action for this 
code path
+        action = ACT_CONSUME; // dummy; compiler must initialize action for 
this code path
     } else {
         try {
             action = AclHelper::getAction(toks[3]);