summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorCharles E. Rolke <chug@apache.org>2012-08-21 14:42:51 +0000
committerCharles E. Rolke <chug@apache.org>2012-08-21 14:42:51 +0000
commita460d82be9889f30d02d293f7ceffd47c40c5dbb (patch)
tree0fe1613e37dc469cc24ba4b8d72b3b13d7dfb2d9 /cpp/src
parentcfbaf96414fda9a0e0ac3439b2a624f061e04654 (diff)
downloadqpid-python-a460d82be9889f30d02d293f7ceffd47c40c5dbb.tar.gz
QPID-4230 Username substitution keywords in Acl file. Repair function definitions that fail Windows compile.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1375583 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/acl/AclData.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/qpid/acl/AclData.cpp b/cpp/src/qpid/acl/AclData.cpp
index 7c14d0985d..6994de2898 100644
--- a/cpp/src/qpid/acl/AclData.cpp
+++ b/cpp/src/qpid/acl/AclData.cpp
@@ -607,8 +607,8 @@ namespace acl {
// Given an Acl rule and an authenticated userId
// do the keyword substitutions on the rule.
//
- void AclData::AclData::substituteUserId(std::string& ruleString,
- const std::string& userId)
+ void AclData::substituteUserId(std::string& ruleString,
+ const std::string& userId)
{
size_t locDomSeparator(0);
std::string user("");
@@ -640,8 +640,8 @@ namespace acl {
// topic key lookups where the keyword string proper is in the
// topic key search tree.
//
- void AclData::AclData::substituteKeywords(std::string& ruleString,
- const std::string& userId)
+ void AclData::substituteKeywords(std::string& ruleString,
+ const std::string& userId)
{
size_t locDomSeparator(0);
std::string user("");