diff options
| author | Ted Ross <tross@apache.org> | 2012-06-11 16:11:19 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2012-06-11 16:11:19 +0000 |
| commit | 9b48cfdd512d79fe667ca423cc3b640ff0f389c9 (patch) | |
| tree | 06b51ba4ac954f82ab254878aaa8b17156374e65 /cpp | |
| parent | a7eccc7e5526051ef3ed398051cd8fc96b03310c (diff) | |
| download | qpid-python-9b48cfdd512d79fe667ca423cc3b640ff0f389c9.tar.gz | |
NO-JIRA - Fixed some Windows Visual Studio build errors
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1348926 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/acl/Acl.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/TopicKeyNode.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/qpid/acl/Acl.cpp b/cpp/src/qpid/acl/Acl.cpp index b68816288a..d941577f6a 100644 --- a/cpp/src/qpid/acl/Acl.cpp +++ b/cpp/src/qpid/acl/Acl.cpp @@ -124,7 +124,7 @@ bool Acl::authorise( } -bool Acl::approveConnection(const broker::Connection& conn) +bool Acl::approveConnection(const qpid::broker::Connection& conn) { return connectionCounter->approveConnection(conn); } diff --git a/cpp/src/qpid/broker/TopicKeyNode.h b/cpp/src/qpid/broker/TopicKeyNode.h index de54e2d636..089342709b 100644 --- a/cpp/src/qpid/broker/TopicKeyNode.h +++ b/cpp/src/qpid/broker/TopicKeyNode.h @@ -166,10 +166,10 @@ class QPID_BROKER_CLASS_EXTERN TopicKeyNode { bool isHash; // children - typedef std::map<const std::string, TopicKeyNode::shared_ptr> ChildMap; + typedef std::map<const std::string, typename TopicKeyNode::shared_ptr> ChildMap; ChildMap childTokens; - TopicKeyNode::shared_ptr starChild; // "*" subtree - TopicKeyNode::shared_ptr hashChild; // "#" subtree + typename TopicKeyNode::shared_ptr starChild; // "*" subtree + typename TopicKeyNode::shared_ptr hashChild; // "#" subtree unsigned int getChildCount() { return childTokens.size() + (starChild ? 1 : 0) + (hashChild ? 1 : 0); } |