Author: tross
Date: Mon Jun 11 16:11:19 2012
New Revision: 1348926
URL: http://svn.apache.org/viewvc?rev=1348926&view=rev
Log:
NO-JIRA - Fixed some Windows Visual Studio build errors
Modified:
qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp?rev=1348926&r1=1348925&r2=1348926&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp Mon Jun 11 16:11:19 2012
@@ -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);
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h?rev=1348926&r1=1348925&r2=1348926&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h Mon Jun 11 16:11:19 2012
@@ -166,10 +166,10 @@ class QPID_BROKER_CLASS_EXTERN TopicKeyN
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); }
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
