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

6 files changed, 25 insertions, 434 deletions

diff --git a/cpp/src/MaxMethodBodySize.vcproj b/cpp/src/MaxMethodBodySize.vcproj
deleted file mode 100644
index cce8b0a8e1..0000000000
--- a/cpp/src/MaxMethodBodySize.vcproj
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<!--

-

- Licensed to the Apache Software Foundation (ASF) under one

- or more contributor license agreements.  See the NOTICE file

- distributed with this work for additional information

- regarding copyright ownership.  The ASF licenses this file

- to you under the Apache License, Version 2.0 (the

- "License"); you may not use this file except in compliance

- with the License.  You may obtain a copy of the License at

-

-  http://www.apache.org/licenses/LICENSE-2.0

-

- Unless required by applicable law or agreed to in writing,

- software distributed under the License is distributed on an

- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- KIND, either express or implied.  See the License for the

- specific language governing permissions and limitations

- under the License.

-

--->

-

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="MaxMethodBodySize"

-	ProjectGUID="{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}"

-	RootNamespace="MaxMethodBodySize"

-	Keyword="Win32Proj"

-	SignManifests="true"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Static_Debug"

-			IntermediateDirectory="Static_Debug\MaxMethodBodySize\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-				DisableSpecificWarnings="4244;4800;4355"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;NOMINMAX"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies=""

-				OutputFile="$(OutDir)\generate_MaxMethodBodySize_h.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="$(OutDir)\generate_MaxMethodBodySize_h"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Static_Release"

-			IntermediateDirectory="Static_Release\MaxMethodBodySize\I386"

-			ConfigurationType="1"

-			CharacterSet="0"

-

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX"

-				RuntimeLibrary="0"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DisableSpecificWarnings="4244;4800;4355"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;NOMINMAX"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies=""

-				OutputFile="$(OutDir)\generate_MaxMethodBodySize_h.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="$(OutDir)\generate_MaxMethodBodySize_h"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="Static_Debug"

-			IntermediateDirectory="Static_Debug\MaxMethodBodySize\AMD64"

-			ConfigurationType="1"

-			CharacterSet="0"

-

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-				DisableSpecificWarnings="4244;4800;4355"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;NOMINMAX;_WIN64"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/machine:AMD64"

-				AdditionalDependencies=""

-				OutputFile="$(OutDir)\generate_MaxMethodBodySize_h.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="$(OutDir)\generate_MaxMethodBodySize_h"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			OutputDirectory="Static_Release"

-			IntermediateDirectory="Static_Release\MaxMethodBodySize\AMD64"

-			ConfigurationType="1"

-			CharacterSet="0"

-

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

-				InterfaceIdentifierFileName="$(InputName)_i.c"

-				ProxyFileName="$(InputName)_p.c"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX"

-				RuntimeLibrary="0"

-				RuntimeTypeInfo="true"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DisableSpecificWarnings="4244;4800;4355"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;NOMINMAX;_WIN64"

-				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/machine:AMD64"

-				AdditionalDependencies=""

-				OutputFile="$(OutDir)\generate_MaxMethodBodySize_h.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="17"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="$(OutDir)\generate_MaxMethodBodySize_h"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;cxx;cc;C;c">

-			<File

-				RelativePath="gen\generate_MaxMethodBodySize_h.cpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hh">

-			<File

-				RelativePath="qpidd.h">

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/src/broker.vcproj b/cpp/src/broker.vcproj
index 662307d0d7..dd7f79f073 100644
--- a/cpp/src/broker.vcproj
+++ b/cpp/src/broker.vcproj
@@ -760,6 +760,9 @@
 				RelativePath="qpid\broker\QueueCleaner.cpp">

 			</File>

 			<File

+				RelativePath="qpid\broker\QueueEvents.cpp">

+			</File>

+			<File

 				RelativePath="qpid\broker\QueueListeners.cpp">

 			</File>

 			<File

@@ -781,6 +784,9 @@
 				RelativePath="qpid\broker\RecoveryManagerImpl.cpp">

 			</File>

 			<File

+				RelativePath="qpid\broker\RetryList.cpp">

+			</File>

+			<File

 				RelativePath="qpid\broker\SecureConnection.cpp">

 			</File>

 			<File

@@ -1166,6 +1172,9 @@
 				RelativePath="qpid\broker\QueueCleaner.h">

 			</File>

 			<File

+				RelativePath="qpid\broker\QueueEvents.h">

+			</File>

+			<File

 				RelativePath="qpid\broker\QueueListeners.h">

 			</File>

 			<File

@@ -1208,6 +1217,9 @@
 				RelativePath="qpid\broker\RecoveryManagerImpl.h">

 			</File>

 			<File

+				RelativePath="qpid\broker\RetryList.h">

+			</File>

+			<File

 				RelativePath="qpid\broker\SaslAuthenticator.h">

 			</File>

 			<File

diff --git a/cpp/src/common.vcproj b/cpp/src/common.vcproj
index 8786ed6b03..ac2bb0e4d5 100644
--- a/cpp/src/common.vcproj
+++ b/cpp/src/common.vcproj
@@ -354,9 +354,6 @@
 				RelativePath="gen\qpid\framing\AMQP_ServerProxy.cpp">

 			</File>

 			<File

-				RelativePath="gen\qpid\framing\BodyHolder_gen.cpp">

-			</File>

-			<File

 				RelativePath="gen\qpid\framing\ClientInvoker.cpp">

 			</File>

 			<File

@@ -630,6 +627,9 @@
 				RelativePath="gen\qpid\framing\MethodBodyDefaultVisitor.cpp">

 			</File>

 			<File

+				RelativePath="gen\qpid\framing\MethodBodyFactory.cpp">

+			</File>

+			<File

 				RelativePath="gen\qpid\framing\QueueDeclareBody.cpp">

 			</File>

 			<File

@@ -786,15 +786,9 @@
 				RelativePath="qpid\framing\Array.cpp">

 			</File>

 			<File

-				RelativePath="qpid\framing\Blob.cpp">

-			</File>

-			<File

 				RelativePath="qpid\framing\BodyHandler.cpp">

 			</File>

 			<File

-				RelativePath="qpid\framing\BodyHolder.cpp">

-			</File>

-			<File

 				RelativePath="qpid\framing\Buffer.cpp">

 			</File>

 			<File

@@ -813,9 +807,6 @@
 				RelativePath="qpid\framing\FrameSet.cpp">

 			</File>

 			<File

-				RelativePath="qpid\framing\MaxMethodBodySize.h">

-			</File>

-			<File

 				RelativePath="qpid\framing\ProtocolInitiation.cpp">

 			</File>

 			<File

@@ -933,10 +924,7 @@
 				RelativePath="qpid\sys\Dispatcher.cpp">

 			</File>

 			<File

-				RelativePath="qpid\sys\PollableCondition.h">

-			</File>

-			<File

-				RelativePath="qpid\sys\PollableQueue.h">

+				RelativePath="qpid\sys\LatencyMetric.cpp">

 			</File>

 			<File

 				RelativePath="qpid\sys\Runnable.cpp">

@@ -1522,15 +1510,12 @@
 				RelativePath="qpid\framing\Array.h">

 			</File>

 			<File

-				RelativePath="qpid\framing\Blob.h">

+				RelativePath="qpid\framing\BodyFactory.h">

 			</File>

 			<File

 				RelativePath="qpid\framing\BodyHandler.h">

 			</File>

 			<File

-				RelativePath="qpid\framing\BodyHolder.h">

-			</File>

-			<File

 				RelativePath="qpid\framing\Buffer.h">

 			</File>

 			<File

@@ -1576,7 +1561,7 @@
 				RelativePath="qpid\framing\Invoker.h">

 			</File>

 			<File

-				RelativePath="qpid\framing\MaxMethodBodySize.h">

+				RelativePath="qpid\framing\MethodBodyFactory.h">

 			</File>

 			<File

 				RelativePath="qpid\framing\MethodContent.h">

@@ -1768,6 +1753,9 @@
 				RelativePath="qpid\sys\IOHandle.h">

 			</File>

 			<File

+				RelativePath="qpid\sys\LatencyMetric.h">

+			</File>

+			<File

 				RelativePath="qpid\sys\LockFile.h">

 			</File>

 			<File

diff --git a/cpp/src/qpid.sln b/cpp/src/qpid.sln
index 7ace10735d..a296a13d25 100644
--- a/cpp/src/qpid.sln
+++ b/cpp/src/qpid.sln
@@ -8,8 +8,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 #

 # MPC Command:

 # C:\ace\MPC\mwc.pl -type vc9 -features boost=1 -static qpid.mwc

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaxMethodBodySize", "MaxMethodBodySize.vcproj", "{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broker", "broker.vcproj", "{09613D48-FECA-1BAD-9D20-8C374564ADCF}"

 	ProjectSection(ProjectDependencies) = postProject

 		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF} = {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}

@@ -21,9 +19,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client.vcproj", "
 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}"

-	ProjectSection(ProjectDependencies) = postProject

-		{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF} = {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmfconsole", "qmfconsole.vcproj", "{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}"

 	ProjectSection(ProjectDependencies) = postProject

@@ -38,14 +33,6 @@ Global
 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32

-		{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.Build.0 = Debug|Win32

-		{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.ActiveCfg = Debug|x64

-		{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.Build.0 = Debug|x64

-		{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.ActiveCfg = Release|Win32

-		{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.Build.0 = Release|Win32

-		{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.ActiveCfg = Release|x64

-		{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.Build.0 = Release|x64

 		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32

 		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.Build.0 = Debug|Win32

 		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|x64.ActiveCfg = Debug|x64

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;