Catch up on recent file additions/removals; fix compile errors on Windows

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@737201 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/qpid/broker/Link.cpp b/cpp/src/qpid/broker/Link.cpp
index 835b37e6eb..e36635831b 100644
--- a/cpp/src/qpid/broker/Link.cpp
+++ b/cpp/src/qpid/broker/Link.cpp
@@ -288,7 +288,7 @@ void Link::maintenanceVisit ()
         connection->requestIOProcessing (boost::bind(&Link::ioThreadProcessing, this));
 }
 
-void Link::reconnect(const TcpAddress& a)
+void Link::reconnect(const qpid::TcpAddress& a)
 {
     Mutex::ScopedLock mutex(lock);
     host = a.host;
diff --git a/cpp/src/qpid/broker/LinkRegistry.cpp b/cpp/src/qpid/broker/LinkRegistry.cpp
index 956a9ea5ae..97b1c32d64 100644
--- a/cpp/src/qpid/broker/LinkRegistry.cpp
+++ b/cpp/src/qpid/broker/LinkRegistry.cpp
@@ -67,14 +67,14 @@ void LinkRegistry::periodicMaintenance ()
     reMappings.clear();
 }
 
-void LinkRegistry::changeAddress(const TcpAddress& oldAddress, const TcpAddress& newAddress)
+void LinkRegistry::changeAddress(const qpid::TcpAddress& oldAddress, const qpid::TcpAddress& newAddress)
 {
     //done on periodic maintenance thread; hold changes in separate
     //map to avoid modifying the link map that is iterated over
     reMappings[createKey(oldAddress)] = newAddress;
 }
 
-bool LinkRegistry::updateAddress(const std::string& oldKey, const TcpAddress& newAddress)
+bool LinkRegistry::updateAddress(const std::string& oldKey, const qpid::TcpAddress& newAddress)
 {
     std::string newKey = createKey(newAddress);
     if (links.find(newKey) != links.end()) {
@@ -296,7 +296,7 @@ std::string LinkRegistry::getAuthIdentity(const std::string& key)
 }
 
 
-std::string LinkRegistry::createKey(const TcpAddress& a)
+std::string LinkRegistry::createKey(const qpid::TcpAddress& a)
 {
     stringstream        keystream;
     keystream << a.host << ":" << a.port;