359 files changed, 0 insertions, 0 deletions

diff --git a/cpp-0-9/DESIGN b/cpp/DESIGN
index 7e9ba6755c..7e9ba6755c 100644
--- a/cpp-0-9/DESIGN
+++ b/cpp/DESIGN
diff --git a/cpp-0-9/LICENSE b/cpp/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/cpp-0-9/LICENSE
+++ b/cpp/LICENSE
diff --git a/cpp-0-9/Makefile.am b/cpp/Makefile.am
index 112cd5dd59..112cd5dd59 100644
--- a/cpp-0-9/Makefile.am
+++ b/cpp/Makefile.am
diff --git a/cpp-0-9/NOTICE b/cpp/NOTICE
index 1e7859909a..1e7859909a 100644
--- a/cpp-0-9/NOTICE
+++ b/cpp/NOTICE
diff --git a/cpp-0-9/README b/cpp/README
index 83e9d6ed5e..83e9d6ed5e 100644
--- a/cpp-0-9/README
+++ b/cpp/README
diff --git a/cpp-0-9/bootstrap b/cpp/bootstrap
index 4fbce77e3f..4fbce77e3f 100755
--- a/cpp-0-9/bootstrap
+++ b/cpp/bootstrap
diff --git a/cpp-0-9/build-aux/compile b/cpp/build-aux/compile
index 1b1d232169..1b1d232169 100755
--- a/cpp-0-9/build-aux/compile
+++ b/cpp/build-aux/compile
diff --git a/cpp-0-9/build-aux/config.guess b/cpp/build-aux/config.guess
index c93201a4d2..c93201a4d2 100755
--- a/cpp-0-9/build-aux/config.guess
+++ b/cpp/build-aux/config.guess
diff --git a/cpp-0-9/build-aux/config.rpath b/cpp/build-aux/config.rpath
index c492a93b66..c492a93b66 100755
--- a/cpp-0-9/build-aux/config.rpath
+++ b/cpp/build-aux/config.rpath
diff --git a/cpp-0-9/build-aux/config.sub b/cpp/build-aux/config.sub
index 7ccee73057..7ccee73057 100755
--- a/cpp-0-9/build-aux/config.sub
+++ b/cpp/build-aux/config.sub
diff --git a/cpp-0-9/build-aux/depcomp b/cpp/build-aux/depcomp
index ca5ea4e1ef..ca5ea4e1ef 100755
--- a/cpp-0-9/build-aux/depcomp
+++ b/cpp/build-aux/depcomp
diff --git a/cpp-0-9/build-aux/install-sh b/cpp/build-aux/install-sh
index 4fbbae7b7f..4fbbae7b7f 100755
--- a/cpp-0-9/build-aux/install-sh
+++ b/cpp/build-aux/install-sh
diff --git a/cpp-0-9/build-aux/ltmain.sh b/cpp/build-aux/ltmain.sh
index c715b59412..c715b59412 100755
--- a/cpp-0-9/build-aux/ltmain.sh
+++ b/cpp/build-aux/ltmain.sh
diff --git a/cpp-0-9/build-aux/mdate-sh b/cpp/build-aux/mdate-sh
index cd916c0a34..cd916c0a34 100755
--- a/cpp-0-9/build-aux/mdate-sh
+++ b/cpp/build-aux/mdate-sh
diff --git a/cpp-0-9/build-aux/missing b/cpp/build-aux/missing
index 1c8ff7049d..1c8ff7049d 100755
--- a/cpp-0-9/build-aux/missing
+++ b/cpp/build-aux/missing
diff --git a/cpp-0-9/configure.ac b/cpp/configure.ac
index 5a1d634184..5a1d634184 100644
--- a/cpp-0-9/configure.ac
+++ b/cpp/configure.ac
diff --git a/cpp-0-9/docs/api/Makefile.am b/cpp/docs/api/Makefile.am
index a02e7dd084..a02e7dd084 100644
--- a/cpp-0-9/docs/api/Makefile.am
+++ b/cpp/docs/api/Makefile.am
diff --git a/cpp-0-9/docs/api/developer.doxygen b/cpp/docs/api/developer.doxygen
index 4679876d09..4679876d09 100644
--- a/cpp-0-9/docs/api/developer.doxygen
+++ b/cpp/docs/api/developer.doxygen
diff --git a/cpp-0-9/docs/api/user.doxygen b/cpp/docs/api/user.doxygen
index 0d92dc283b..0d92dc283b 100644
--- a/cpp-0-9/docs/api/user.doxygen
+++ b/cpp/docs/api/user.doxygen
diff --git a/cpp-0-9/docs/man/Makefile.am b/cpp/docs/man/Makefile.am
index f637328cbb..f637328cbb 100644
--- a/cpp-0-9/docs/man/Makefile.am
+++ b/cpp/docs/man/Makefile.am
diff --git a/cpp-0-9/docs/man/qpidd.x b/cpp/docs/man/qpidd.x
index e60505cc9c..e60505cc9c 100644
--- a/cpp-0-9/docs/man/qpidd.x
+++ b/cpp/docs/man/qpidd.x
diff --git a/cpp-0-9/etc/qpidd b/cpp/etc/qpidd
index cfd6049c9b..cfd6049c9b 100755
--- a/cpp-0-9/etc/qpidd
+++ b/cpp/etc/qpidd
diff --git a/cpp-0-9/gen/Makefile.am b/cpp/gen/Makefile.am
index e16923fcc2..e16923fcc2 100644
--- a/cpp-0-9/gen/Makefile.am
+++ b/cpp/gen/Makefile.am
diff --git a/cpp-0-9/gen/make-gen-src-mk.sh b/cpp/gen/make-gen-src-mk.sh
index 08eb8ea134..08eb8ea134 100755
--- a/cpp-0-9/gen/make-gen-src-mk.sh
+++ b/cpp/gen/make-gen-src-mk.sh
diff --git a/cpp-0-9/gentools/README b/cpp/gentools/README
index c4abecc199..c4abecc199 100644
--- a/cpp-0-9/gentools/README
+++ b/cpp/gentools/README
diff --git a/cpp-0-9/gentools/build b/cpp/gentools/build
index ad9827b113..ad9827b113 100755
--- a/cpp-0-9/gentools/build
+++ b/cpp/gentools/build
diff --git a/cpp-0-9/gentools/build.xml b/cpp/gentools/build.xml
index 8fba85bc57..8fba85bc57 100644
--- a/cpp-0-9/gentools/build.xml
+++ b/cpp/gentools/build.xml
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpClass.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpClass.java
index 2e8bdaf971..2e8bdaf971 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpClass.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpClass.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
index 01d4df283b..01d4df283b 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpConstant.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
index 6ccd2dbf99..6ccd2dbf99 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
index 7b38f5cf3c..7b38f5cf3c 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpDomain.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
index 4796f31fb3..4796f31fb3 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
index 7e2974a444..7e2974a444 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
index f91d98bfe7..f91d98bfe7 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpField.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpField.java
index e1177e0154..e1177e0154 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpField.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpField.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
index c91ec3d623..c91ec3d623 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
index 3f86326ce2..3f86326ce2 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpMethod.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
index f3c5bdd935..f3c5bdd935 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
index 59eedd2a2b..59eedd2a2b 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpModel.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpModel.java
index 721247a4b2..721247a4b2 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpModel.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpModel.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
index 34d3b7ca5f..34d3b7ca5f 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
index 3706c9391d..3706c9391d 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
index 10978d0e4a..10978d0e4a 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpParseException.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
index 4d9f495390..4d9f495390 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
index b1e6f3d712..b1e6f3d712 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
index 1053543fdd..1053543fdd 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpVersion.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
index 579d8e28b2..579d8e28b2 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
index 4406893cbb..4406893cbb 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
index b46d6e8cfc..b46d6e8cfc 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java b/cpp/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
index 505a70dc85..505a70dc85 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/Generator.java b/cpp/gentools/src/org/apache/qpid/gentools/Generator.java
index e7ccd64fbe..e7ccd64fbe 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/Generator.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/Generator.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/JavaGenerator.java b/cpp/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
index 9acfaf65fa..9acfaf65fa 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/LanguageConverter.java b/cpp/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
index cb0a14e3bc..cb0a14e3bc 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/Main.java b/cpp/gentools/src/org/apache/qpid/gentools/Main.java
index f1728ab290..f1728ab290 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/Main.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/Main.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/NodeAware.java b/cpp/gentools/src/org/apache/qpid/gentools/NodeAware.java
index df4e0ecb02..df4e0ecb02 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/NodeAware.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/NodeAware.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/Printable.java b/cpp/gentools/src/org/apache/qpid/gentools/Printable.java
index a73878c506..a73878c506 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/Printable.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/Printable.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java b/cpp/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
index cdaf381f0a..cdaf381f0a 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/Utils.java b/cpp/gentools/src/org/apache/qpid/gentools/Utils.java
index ade00cd8c7..ade00cd8c7 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/Utils.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/Utils.java
diff --git a/cpp-0-9/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java b/cpp/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
index 1f6b9f1a6d..1f6b9f1a6d 100644
--- a/cpp-0-9/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index 2b96e55444..2b96e55444 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
index 6a0e6eedb3..6a0e6eedb3 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index b43b3a6747..b43b3a6747 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_Constants.h.tmpl b/cpp/gentools/templ.cpp/AMQP_Constants.h.tmpl
index 4631bc8de6..4631bc8de6 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_Constants.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_Constants.h.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl b/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
index 9753b454ba..9753b454ba 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
index 6fc79180b2..6fc79180b2 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
index 84596ea5a0..84596ea5a0 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index 7f47ac8efb..7f47ac8efb 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index 5575f3b1df..5575f3b1df 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index 5b8a12ee34..5b8a12ee34 100644
--- a/cpp-0-9/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
diff --git a/cpp-0-9/gentools/templ.cpp/MethodBodyClass.h.tmpl b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 351399a991..351399a991 100644
--- a/cpp-0-9/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
diff --git a/cpp-0-9/gentools/templ.java/AmqpConstantsClass.tmpl b/cpp/gentools/templ.java/AmqpConstantsClass.tmpl
index 8d459f2977..8d459f2977 100644
--- a/cpp-0-9/gentools/templ.java/AmqpConstantsClass.tmpl
+++ b/cpp/gentools/templ.java/AmqpConstantsClass.tmpl
diff --git a/cpp-0-9/gentools/templ.java/MethodBodyClass.tmpl b/cpp/gentools/templ.java/MethodBodyClass.tmpl
index 42582fcb7c..42582fcb7c 100644
--- a/cpp-0-9/gentools/templ.java/MethodBodyClass.tmpl
+++ b/cpp/gentools/templ.java/MethodBodyClass.tmpl
diff --git a/cpp-0-9/gentools/templ.java/MethodRegistryClass.tmpl b/cpp/gentools/templ.java/MethodRegistryClass.tmpl
index 12e6fe250e..12e6fe250e 100644
--- a/cpp-0-9/gentools/templ.java/MethodRegistryClass.tmpl
+++ b/cpp/gentools/templ.java/MethodRegistryClass.tmpl
diff --git a/cpp-0-9/gentools/templ.java/PropertyContentHeaderClass.tmpl b/cpp/gentools/templ.java/PropertyContentHeaderClass.tmpl
index 3c147cf6b6..3c147cf6b6 100644
--- a/cpp-0-9/gentools/templ.java/PropertyContentHeaderClass.tmpl
+++ b/cpp/gentools/templ.java/PropertyContentHeaderClass.tmpl
diff --git a/cpp-0-9/gentools/templ.java/ProtocolVersionListClass.tmpl b/cpp/gentools/templ.java/ProtocolVersionListClass.tmpl
index bc98e0c1ea..bc98e0c1ea 100644
--- a/cpp-0-9/gentools/templ.java/ProtocolVersionListClass.tmpl
+++ b/cpp/gentools/templ.java/ProtocolVersionListClass.tmpl
diff --git a/cpp-0-9/gentools/xml-src/amqp-0.10.test.xml b/cpp/gentools/xml-src/amqp-0.10.test.xml
index 5d3d80648b..5d3d80648b 100644
--- a/cpp-0-9/gentools/xml-src/amqp-0.10.test.xml
+++ b/cpp/gentools/xml-src/amqp-0.10.test.xml
diff --git a/cpp-0-9/gentools/xml-src/amqp-0.8.test.xml b/cpp/gentools/xml-src/amqp-0.8.test.xml
index b0adf31828..b0adf31828 100644
--- a/cpp-0-9/gentools/xml-src/amqp-0.8.test.xml
+++ b/cpp/gentools/xml-src/amqp-0.8.test.xml
diff --git a/cpp-0-9/gentools/xml-src/amqp-0.9.test.xml b/cpp/gentools/xml-src/amqp-0.9.test.xml
index e12e9c787a..e12e9c787a 100644
--- a/cpp-0-9/gentools/xml-src/amqp-0.9.test.xml
+++ b/cpp/gentools/xml-src/amqp-0.9.test.xml
diff --git a/cpp-0-9/gentools/xml-src/cluster-0.9.test.xml b/cpp/gentools/xml-src/cluster-0.9.test.xml
index 142e6c9380..142e6c9380 100644
--- a/cpp-0-9/gentools/xml-src/cluster-0.9.test.xml
+++ b/cpp/gentools/xml-src/cluster-0.9.test.xml
diff --git a/cpp-0-9/lib/Makefile.am b/cpp/lib/Makefile.am
index 09a689bc76..09a689bc76 100644
--- a/cpp-0-9/lib/Makefile.am
+++ b/cpp/lib/Makefile.am
diff --git a/cpp-0-9/lib/broker/AccumulatedAck.cpp b/cpp/lib/broker/AccumulatedAck.cpp
index ff471b0287..ff471b0287 100644
--- a/cpp-0-9/lib/broker/AccumulatedAck.cpp
+++ b/cpp/lib/broker/AccumulatedAck.cpp
diff --git a/cpp-0-9/lib/broker/AccumulatedAck.h b/cpp/lib/broker/AccumulatedAck.h
index c4a6e3b79b..c4a6e3b79b 100644
--- a/cpp-0-9/lib/broker/AccumulatedAck.h
+++ b/cpp/lib/broker/AccumulatedAck.h
diff --git a/cpp-0-9/lib/broker/AutoDelete.cpp b/cpp/lib/broker/AutoDelete.cpp
index 2037a9c71c..2037a9c71c 100644
--- a/cpp-0-9/lib/broker/AutoDelete.cpp
+++ b/cpp/lib/broker/AutoDelete.cpp
diff --git a/cpp-0-9/lib/broker/AutoDelete.h b/cpp/lib/broker/AutoDelete.h
index 9034de1730..9034de1730 100644
--- a/cpp-0-9/lib/broker/AutoDelete.h
+++ b/cpp/lib/broker/AutoDelete.h
diff --git a/cpp-0-9/lib/broker/Binding.h b/cpp/lib/broker/Binding.h
index 16ca223208..16ca223208 100644
--- a/cpp-0-9/lib/broker/Binding.h
+++ b/cpp/lib/broker/Binding.h
diff --git a/cpp-0-9/lib/broker/Broker.cpp b/cpp/lib/broker/Broker.cpp
index f650452e33..f650452e33 100644
--- a/cpp-0-9/lib/broker/Broker.cpp
+++ b/cpp/lib/broker/Broker.cpp
diff --git a/cpp-0-9/lib/broker/Broker.h b/cpp/lib/broker/Broker.h
index 7c21e90b18..7c21e90b18 100644
--- a/cpp-0-9/lib/broker/Broker.h
+++ b/cpp/lib/broker/Broker.h
diff --git a/cpp-0-9/lib/broker/BrokerAdapter.cpp b/cpp/lib/broker/BrokerAdapter.cpp
index 981801c40e..981801c40e 100644
--- a/cpp-0-9/lib/broker/BrokerAdapter.cpp
+++ b/cpp/lib/broker/BrokerAdapter.cpp
diff --git a/cpp-0-9/lib/broker/BrokerAdapter.h b/cpp/lib/broker/BrokerAdapter.h
index 2fafbcc180..2fafbcc180 100644
--- a/cpp-0-9/lib/broker/BrokerAdapter.h
+++ b/cpp/lib/broker/BrokerAdapter.h
diff --git a/cpp-0-9/lib/broker/BrokerChannel.cpp b/cpp/lib/broker/BrokerChannel.cpp
index 5673a2c42a..5673a2c42a 100644
--- a/cpp-0-9/lib/broker/BrokerChannel.cpp
+++ b/cpp/lib/broker/BrokerChannel.cpp
diff --git a/cpp-0-9/lib/broker/BrokerChannel.h b/cpp/lib/broker/BrokerChannel.h
index 5085783685..5085783685 100644
--- a/cpp-0-9/lib/broker/BrokerChannel.h
+++ b/cpp/lib/broker/BrokerChannel.h
diff --git a/cpp-0-9/lib/broker/BrokerExchange.h b/cpp/lib/broker/BrokerExchange.h
index 6f4e9e6671..6f4e9e6671 100644
--- a/cpp-0-9/lib/broker/BrokerExchange.h
+++ b/cpp/lib/broker/BrokerExchange.h
diff --git a/cpp-0-9/lib/broker/BrokerMessage.cpp b/cpp/lib/broker/BrokerMessage.cpp
index 91ba3dfec0..91ba3dfec0 100644
--- a/cpp-0-9/lib/broker/BrokerMessage.cpp
+++ b/cpp/lib/broker/BrokerMessage.cpp
diff --git a/cpp-0-9/lib/broker/BrokerMessage.h b/cpp/lib/broker/BrokerMessage.h
index fcb104edbb..fcb104edbb 100644
--- a/cpp-0-9/lib/broker/BrokerMessage.h
+++ b/cpp/lib/broker/BrokerMessage.h
diff --git a/cpp-0-9/lib/broker/BrokerMessageBase.h b/cpp/lib/broker/BrokerMessageBase.h
index 709369ae2f..709369ae2f 100644
--- a/cpp-0-9/lib/broker/BrokerMessageBase.h
+++ b/cpp/lib/broker/BrokerMessageBase.h
diff --git a/cpp-0-9/lib/broker/BrokerMessageMessage.cpp b/cpp/lib/broker/BrokerMessageMessage.cpp
index 3449078d70..3449078d70 100644
--- a/cpp-0-9/lib/broker/BrokerMessageMessage.cpp
+++ b/cpp/lib/broker/BrokerMessageMessage.cpp
diff --git a/cpp-0-9/lib/broker/BrokerMessageMessage.h b/cpp/lib/broker/BrokerMessageMessage.h
index 8a2ff3a063..8a2ff3a063 100644
--- a/cpp-0-9/lib/broker/BrokerMessageMessage.h
+++ b/cpp/lib/broker/BrokerMessageMessage.h
diff --git a/cpp-0-9/lib/broker/BrokerQueue.cpp b/cpp/lib/broker/BrokerQueue.cpp
index 31309bd6c5..31309bd6c5 100644
--- a/cpp-0-9/lib/broker/BrokerQueue.cpp
+++ b/cpp/lib/broker/BrokerQueue.cpp
diff --git a/cpp-0-9/lib/broker/BrokerQueue.h b/cpp/lib/broker/BrokerQueue.h
index 12f5815027..12f5815027 100644
--- a/cpp-0-9/lib/broker/BrokerQueue.h
+++ b/cpp/lib/broker/BrokerQueue.h
diff --git a/cpp-0-9/lib/broker/BrokerSingleton.cpp b/cpp/lib/broker/BrokerSingleton.cpp
index 4571764850..4571764850 100644
--- a/cpp-0-9/lib/broker/BrokerSingleton.cpp
+++ b/cpp/lib/broker/BrokerSingleton.cpp
diff --git a/cpp-0-9/lib/broker/BrokerSingleton.h b/cpp/lib/broker/BrokerSingleton.h
index 139e02a5fd..139e02a5fd 100644
--- a/cpp-0-9/lib/broker/BrokerSingleton.h
+++ b/cpp/lib/broker/BrokerSingleton.h
diff --git a/cpp-0-9/lib/broker/CompletionHandler.h b/cpp/lib/broker/CompletionHandler.h
index 9d51656282..9d51656282 100644
--- a/cpp-0-9/lib/broker/CompletionHandler.h
+++ b/cpp/lib/broker/CompletionHandler.h
diff --git a/cpp-0-9/lib/broker/Configuration.cpp b/cpp/lib/broker/Configuration.cpp
index e83c359f2d..e83c359f2d 100644
--- a/cpp-0-9/lib/broker/Configuration.cpp
+++ b/cpp/lib/broker/Configuration.cpp
diff --git a/cpp-0-9/lib/broker/Configuration.h b/cpp/lib/broker/Configuration.h
index 27c743c8f0..27c743c8f0 100644
--- a/cpp-0-9/lib/broker/Configuration.h
+++ b/cpp/lib/broker/Configuration.h
diff --git a/cpp-0-9/lib/broker/Connection.cpp b/cpp/lib/broker/Connection.cpp
index ae0114cba9..ae0114cba9 100644
--- a/cpp-0-9/lib/broker/Connection.cpp
+++ b/cpp/lib/broker/Connection.cpp
diff --git a/cpp-0-9/lib/broker/Connection.h b/cpp/lib/broker/Connection.h
index 1314ccbd97..1314ccbd97 100644
--- a/cpp-0-9/lib/broker/Connection.h
+++ b/cpp/lib/broker/Connection.h
diff --git a/cpp-0-9/lib/broker/ConnectionFactory.cpp b/cpp/lib/broker/ConnectionFactory.cpp
index 20485dd0e1..20485dd0e1 100644
--- a/cpp-0-9/lib/broker/ConnectionFactory.cpp
+++ b/cpp/lib/broker/ConnectionFactory.cpp
diff --git a/cpp-0-9/lib/broker/ConnectionFactory.h b/cpp/lib/broker/ConnectionFactory.h
index 9147384b2a..9147384b2a 100644
--- a/cpp-0-9/lib/broker/ConnectionFactory.h
+++ b/cpp/lib/broker/ConnectionFactory.h
diff --git a/cpp-0-9/lib/broker/ConnectionToken.h b/cpp/lib/broker/ConnectionToken.h
index 7e7f813d0e..7e7f813d0e 100644
--- a/cpp-0-9/lib/broker/ConnectionToken.h
+++ b/cpp/lib/broker/ConnectionToken.h
diff --git a/cpp-0-9/lib/broker/Consumer.h b/cpp/lib/broker/Consumer.h
index 26deef4a26..26deef4a26 100644
--- a/cpp-0-9/lib/broker/Consumer.h
+++ b/cpp/lib/broker/Consumer.h
diff --git a/cpp-0-9/lib/broker/Content.h b/cpp/lib/broker/Content.h
index b65a454778..b65a454778 100644
--- a/cpp-0-9/lib/broker/Content.h
+++ b/cpp/lib/broker/Content.h
diff --git a/cpp-0-9/lib/broker/DeletingTxOp.cpp b/cpp/lib/broker/DeletingTxOp.cpp
index 25fe9c98db..25fe9c98db 100644
--- a/cpp-0-9/lib/broker/DeletingTxOp.cpp
+++ b/cpp/lib/broker/DeletingTxOp.cpp
diff --git a/cpp-0-9/lib/broker/DeletingTxOp.h b/cpp/lib/broker/DeletingTxOp.h
index 3e026cd4ca..3e026cd4ca 100644
--- a/cpp-0-9/lib/broker/DeletingTxOp.h
+++ b/cpp/lib/broker/DeletingTxOp.h
diff --git a/cpp-0-9/lib/broker/Deliverable.h b/cpp/lib/broker/Deliverable.h
index e33443555d..e33443555d 100644
--- a/cpp-0-9/lib/broker/Deliverable.h
+++ b/cpp/lib/broker/Deliverable.h
diff --git a/cpp-0-9/lib/broker/DeliverableMessage.cpp b/cpp/lib/broker/DeliverableMessage.cpp
index b9c89da690..b9c89da690 100644
--- a/cpp-0-9/lib/broker/DeliverableMessage.cpp
+++ b/cpp/lib/broker/DeliverableMessage.cpp
diff --git a/cpp-0-9/lib/broker/DeliverableMessage.h b/cpp/lib/broker/DeliverableMessage.h
index 962f0da640..962f0da640 100644
--- a/cpp-0-9/lib/broker/DeliverableMessage.h
+++ b/cpp/lib/broker/DeliverableMessage.h
diff --git a/cpp-0-9/lib/broker/DeliveryRecord.cpp b/cpp/lib/broker/DeliveryRecord.cpp
index 0d2e5325c5..0d2e5325c5 100644
--- a/cpp-0-9/lib/broker/DeliveryRecord.cpp
+++ b/cpp/lib/broker/DeliveryRecord.cpp
diff --git a/cpp-0-9/lib/broker/DeliveryRecord.h b/cpp/lib/broker/DeliveryRecord.h
index bda2c2ec90..bda2c2ec90 100644
--- a/cpp-0-9/lib/broker/DeliveryRecord.h
+++ b/cpp/lib/broker/DeliveryRecord.h
diff --git a/cpp-0-9/lib/broker/DirectExchange.cpp b/cpp/lib/broker/DirectExchange.cpp
index c898ae8d7e..c898ae8d7e 100644
--- a/cpp-0-9/lib/broker/DirectExchange.cpp
+++ b/cpp/lib/broker/DirectExchange.cpp
diff --git a/cpp-0-9/lib/broker/DirectExchange.h b/cpp/lib/broker/DirectExchange.h
index a7ef5aca9e..a7ef5aca9e 100644
--- a/cpp-0-9/lib/broker/DirectExchange.h
+++ b/cpp/lib/broker/DirectExchange.h
diff --git a/cpp-0-9/lib/broker/ExchangeBinding.cpp b/cpp/lib/broker/ExchangeBinding.cpp
index bf2102414d..bf2102414d 100644
--- a/cpp-0-9/lib/broker/ExchangeBinding.cpp
+++ b/cpp/lib/broker/ExchangeBinding.cpp
diff --git a/cpp-0-9/lib/broker/ExchangeBinding.h b/cpp/lib/broker/ExchangeBinding.h
index 2afaa89552..2afaa89552 100644
--- a/cpp-0-9/lib/broker/ExchangeBinding.h
+++ b/cpp/lib/broker/ExchangeBinding.h
diff --git a/cpp-0-9/lib/broker/ExchangeRegistry.cpp b/cpp/lib/broker/ExchangeRegistry.cpp
index 3e5ed89b54..3e5ed89b54 100644
--- a/cpp-0-9/lib/broker/ExchangeRegistry.cpp
+++ b/cpp/lib/broker/ExchangeRegistry.cpp
diff --git a/cpp-0-9/lib/broker/ExchangeRegistry.h b/cpp/lib/broker/ExchangeRegistry.h
index aeb32753df..aeb32753df 100644
--- a/cpp-0-9/lib/broker/ExchangeRegistry.h
+++ b/cpp/lib/broker/ExchangeRegistry.h
diff --git a/cpp-0-9/lib/broker/FanOutExchange.cpp b/cpp/lib/broker/FanOutExchange.cpp
index 48afcc20d5..48afcc20d5 100644
--- a/cpp-0-9/lib/broker/FanOutExchange.cpp
+++ b/cpp/lib/broker/FanOutExchange.cpp
diff --git a/cpp-0-9/lib/broker/FanOutExchange.h b/cpp/lib/broker/FanOutExchange.h
index 6dc70e69bb..6dc70e69bb 100644
--- a/cpp-0-9/lib/broker/FanOutExchange.h
+++ b/cpp/lib/broker/FanOutExchange.h
diff --git a/cpp-0-9/lib/broker/HandlerImpl.h b/cpp/lib/broker/HandlerImpl.h
index c55a36da45..c55a36da45 100644
--- a/cpp-0-9/lib/broker/HandlerImpl.h
+++ b/cpp/lib/broker/HandlerImpl.h
diff --git a/cpp-0-9/lib/broker/HeadersExchange.cpp b/cpp/lib/broker/HeadersExchange.cpp
index acd344725a..acd344725a 100644
--- a/cpp-0-9/lib/broker/HeadersExchange.cpp
+++ b/cpp/lib/broker/HeadersExchange.cpp
diff --git a/cpp-0-9/lib/broker/HeadersExchange.h b/cpp/lib/broker/HeadersExchange.h
index 5e8da5ad85..5e8da5ad85 100644
--- a/cpp-0-9/lib/broker/HeadersExchange.h
+++ b/cpp/lib/broker/HeadersExchange.h
diff --git a/cpp-0-9/lib/broker/InMemoryContent.cpp b/cpp/lib/broker/InMemoryContent.cpp
index 3e4ac29486..3e4ac29486 100644
--- a/cpp-0-9/lib/broker/InMemoryContent.cpp
+++ b/cpp/lib/broker/InMemoryContent.cpp
diff --git a/cpp-0-9/lib/broker/InMemoryContent.h b/cpp/lib/broker/InMemoryContent.h
index 7a58ace3a7..7a58ace3a7 100644
--- a/cpp-0-9/lib/broker/InMemoryContent.h
+++ b/cpp/lib/broker/InMemoryContent.h
diff --git a/cpp-0-9/lib/broker/LazyLoadedContent.cpp b/cpp/lib/broker/LazyLoadedContent.cpp
index 131943b448..131943b448 100644
--- a/cpp-0-9/lib/broker/LazyLoadedContent.cpp
+++ b/cpp/lib/broker/LazyLoadedContent.cpp
diff --git a/cpp-0-9/lib/broker/LazyLoadedContent.h b/cpp/lib/broker/LazyLoadedContent.h
index e000a4ef69..e000a4ef69 100644
--- a/cpp-0-9/lib/broker/LazyLoadedContent.h
+++ b/cpp/lib/broker/LazyLoadedContent.h
diff --git a/cpp-0-9/lib/broker/Makefile.am b/cpp/lib/broker/Makefile.am
index 68649c2b28..68649c2b28 100644
--- a/cpp-0-9/lib/broker/Makefile.am
+++ b/cpp/lib/broker/Makefile.am
diff --git a/cpp-0-9/lib/broker/MessageBuilder.cpp b/cpp/lib/broker/MessageBuilder.cpp
index 8bffaef50f..8bffaef50f 100644
--- a/cpp-0-9/lib/broker/MessageBuilder.cpp
+++ b/cpp/lib/broker/MessageBuilder.cpp
diff --git a/cpp-0-9/lib/broker/MessageBuilder.h b/cpp/lib/broker/MessageBuilder.h
index 30834e1075..30834e1075 100644
--- a/cpp-0-9/lib/broker/MessageBuilder.h
+++ b/cpp/lib/broker/MessageBuilder.h
diff --git a/cpp-0-9/lib/broker/MessageHandlerImpl.cpp b/cpp/lib/broker/MessageHandlerImpl.cpp
index fa7c10f26c..fa7c10f26c 100644
--- a/cpp-0-9/lib/broker/MessageHandlerImpl.cpp
+++ b/cpp/lib/broker/MessageHandlerImpl.cpp
diff --git a/cpp-0-9/lib/broker/MessageHandlerImpl.h b/cpp/lib/broker/MessageHandlerImpl.h
index 872d429d5c..872d429d5c 100644
--- a/cpp-0-9/lib/broker/MessageHandlerImpl.h
+++ b/cpp/lib/broker/MessageHandlerImpl.h
diff --git a/cpp-0-9/lib/broker/MessageStore.h b/cpp/lib/broker/MessageStore.h
index 9e38408886..9e38408886 100644
--- a/cpp-0-9/lib/broker/MessageStore.h
+++ b/cpp/lib/broker/MessageStore.h
diff --git a/cpp-0-9/lib/broker/MessageStoreModule.cpp b/cpp/lib/broker/MessageStoreModule.cpp
index 676e86f84a..676e86f84a 100644
--- a/cpp-0-9/lib/broker/MessageStoreModule.cpp
+++ b/cpp/lib/broker/MessageStoreModule.cpp
diff --git a/cpp-0-9/lib/broker/MessageStoreModule.h b/cpp/lib/broker/MessageStoreModule.h
index 27fedbf635..27fedbf635 100644
--- a/cpp-0-9/lib/broker/MessageStoreModule.h
+++ b/cpp/lib/broker/MessageStoreModule.h
diff --git a/cpp-0-9/lib/broker/NameGenerator.cpp b/cpp/lib/broker/NameGenerator.cpp
index 3f281859fa..3f281859fa 100644
--- a/cpp-0-9/lib/broker/NameGenerator.cpp
+++ b/cpp/lib/broker/NameGenerator.cpp
diff --git a/cpp-0-9/lib/broker/NameGenerator.h b/cpp/lib/broker/NameGenerator.h
index b2dbbdfb69..b2dbbdfb69 100644
--- a/cpp-0-9/lib/broker/NameGenerator.h
+++ b/cpp/lib/broker/NameGenerator.h
diff --git a/cpp-0-9/lib/broker/NullMessageStore.cpp b/cpp/lib/broker/NullMessageStore.cpp
index bcb15c2ae0..bcb15c2ae0 100644
--- a/cpp-0-9/lib/broker/NullMessageStore.cpp
+++ b/cpp/lib/broker/NullMessageStore.cpp
diff --git a/cpp-0-9/lib/broker/NullMessageStore.h b/cpp/lib/broker/NullMessageStore.h
index 705f18ab43..705f18ab43 100644
--- a/cpp-0-9/lib/broker/NullMessageStore.h
+++ b/cpp/lib/broker/NullMessageStore.h
diff --git a/cpp-0-9/lib/broker/Prefetch.h b/cpp/lib/broker/Prefetch.h
index b6d4026c3f..b6d4026c3f 100644
--- a/cpp-0-9/lib/broker/Prefetch.h
+++ b/cpp/lib/broker/Prefetch.h
diff --git a/cpp-0-9/lib/broker/QueuePolicy.cpp b/cpp/lib/broker/QueuePolicy.cpp
index 94b86f2bbb..94b86f2bbb 100644
--- a/cpp-0-9/lib/broker/QueuePolicy.cpp
+++ b/cpp/lib/broker/QueuePolicy.cpp
diff --git a/cpp-0-9/lib/broker/QueuePolicy.h b/cpp/lib/broker/QueuePolicy.h
index e7688f3e67..e7688f3e67 100644
--- a/cpp-0-9/lib/broker/QueuePolicy.h
+++ b/cpp/lib/broker/QueuePolicy.h
diff --git a/cpp-0-9/lib/broker/QueueRegistry.cpp b/cpp/lib/broker/QueueRegistry.cpp
index d33cd09840..d33cd09840 100644
--- a/cpp-0-9/lib/broker/QueueRegistry.cpp
+++ b/cpp/lib/broker/QueueRegistry.cpp
diff --git a/cpp-0-9/lib/broker/QueueRegistry.h b/cpp/lib/broker/QueueRegistry.h
index 079034359e..079034359e 100644
--- a/cpp-0-9/lib/broker/QueueRegistry.h
+++ b/cpp/lib/broker/QueueRegistry.h
diff --git a/cpp-0-9/lib/broker/RecoveryManager.cpp b/cpp/lib/broker/RecoveryManager.cpp
index 6548e6a24f..6548e6a24f 100644
--- a/cpp-0-9/lib/broker/RecoveryManager.cpp
+++ b/cpp/lib/broker/RecoveryManager.cpp
diff --git a/cpp-0-9/lib/broker/RecoveryManager.h b/cpp/lib/broker/RecoveryManager.h
index d4e4cff3fd..d4e4cff3fd 100644
--- a/cpp-0-9/lib/broker/RecoveryManager.h
+++ b/cpp/lib/broker/RecoveryManager.h
diff --git a/cpp-0-9/lib/broker/Reference.cpp b/cpp/lib/broker/Reference.cpp
index c4c33e6363..c4c33e6363 100644
--- a/cpp-0-9/lib/broker/Reference.cpp
+++ b/cpp/lib/broker/Reference.cpp
diff --git a/cpp-0-9/lib/broker/Reference.h b/cpp/lib/broker/Reference.h
index e453645a54..e453645a54 100644
--- a/cpp-0-9/lib/broker/Reference.h
+++ b/cpp/lib/broker/Reference.h
diff --git a/cpp-0-9/lib/broker/TopicExchange.cpp b/cpp/lib/broker/TopicExchange.cpp
index 3ebb3c8c56..3ebb3c8c56 100644
--- a/cpp-0-9/lib/broker/TopicExchange.cpp
+++ b/cpp/lib/broker/TopicExchange.cpp
diff --git a/cpp-0-9/lib/broker/TopicExchange.h b/cpp/lib/broker/TopicExchange.h
index fa0c86863a..fa0c86863a 100644
--- a/cpp-0-9/lib/broker/TopicExchange.h
+++ b/cpp/lib/broker/TopicExchange.h
diff --git a/cpp-0-9/lib/broker/TransactionalStore.h b/cpp/lib/broker/TransactionalStore.h
index 17bca3878a..17bca3878a 100644
--- a/cpp-0-9/lib/broker/TransactionalStore.h
+++ b/cpp/lib/broker/TransactionalStore.h
diff --git a/cpp-0-9/lib/broker/TxAck.cpp b/cpp/lib/broker/TxAck.cpp
index b5211158f3..b5211158f3 100644
--- a/cpp-0-9/lib/broker/TxAck.cpp
+++ b/cpp/lib/broker/TxAck.cpp
diff --git a/cpp-0-9/lib/broker/TxAck.h b/cpp/lib/broker/TxAck.h
index 88c321c445..88c321c445 100644
--- a/cpp-0-9/lib/broker/TxAck.h
+++ b/cpp/lib/broker/TxAck.h
diff --git a/cpp-0-9/lib/broker/TxBuffer.cpp b/cpp/lib/broker/TxBuffer.cpp
index acd3283bb7..acd3283bb7 100644
--- a/cpp-0-9/lib/broker/TxBuffer.cpp
+++ b/cpp/lib/broker/TxBuffer.cpp
diff --git a/cpp-0-9/lib/broker/TxBuffer.h b/cpp/lib/broker/TxBuffer.h
index 2d9a2a3679..2d9a2a3679 100644
--- a/cpp-0-9/lib/broker/TxBuffer.h
+++ b/cpp/lib/broker/TxBuffer.h
diff --git a/cpp-0-9/lib/broker/TxOp.h b/cpp/lib/broker/TxOp.h
index abba84a8e8..abba84a8e8 100644
--- a/cpp-0-9/lib/broker/TxOp.h
+++ b/cpp/lib/broker/TxOp.h
diff --git a/cpp-0-9/lib/broker/TxPublish.cpp b/cpp/lib/broker/TxPublish.cpp
index 49dd8abd89..49dd8abd89 100644
--- a/cpp-0-9/lib/broker/TxPublish.cpp
+++ b/cpp/lib/broker/TxPublish.cpp
diff --git a/cpp-0-9/lib/broker/TxPublish.h b/cpp/lib/broker/TxPublish.h
index 75f201257e..75f201257e 100644
--- a/cpp-0-9/lib/broker/TxPublish.h
+++ b/cpp/lib/broker/TxPublish.h
diff --git a/cpp-0-9/lib/client/Basic.cpp b/cpp/lib/client/Basic.cpp
index 4a1cf249a8..4a1cf249a8 100644
--- a/cpp-0-9/lib/client/Basic.cpp
+++ b/cpp/lib/client/Basic.cpp
diff --git a/cpp-0-9/lib/client/Basic.h b/cpp/lib/client/Basic.h
index f6ae633ab8..f6ae633ab8 100644
--- a/cpp-0-9/lib/client/Basic.h
+++ b/cpp/lib/client/Basic.h
diff --git a/cpp-0-9/lib/client/ClientAdapter.cpp b/cpp/lib/client/ClientAdapter.cpp
index c77f049c96..c77f049c96 100644
--- a/cpp-0-9/lib/client/ClientAdapter.cpp
+++ b/cpp/lib/client/ClientAdapter.cpp
diff --git a/cpp-0-9/lib/client/ClientAdapter.h b/cpp/lib/client/ClientAdapter.h
index d5e16fc6ad..d5e16fc6ad 100644
--- a/cpp-0-9/lib/client/ClientAdapter.h
+++ b/cpp/lib/client/ClientAdapter.h
diff --git a/cpp-0-9/lib/client/ClientChannel.cpp b/cpp/lib/client/ClientChannel.cpp
index 84aa73e6bc..84aa73e6bc 100644
--- a/cpp-0-9/lib/client/ClientChannel.cpp
+++ b/cpp/lib/client/ClientChannel.cpp
diff --git a/cpp-0-9/lib/client/ClientChannel.h b/cpp/lib/client/ClientChannel.h
index 3ecab05d0b..3ecab05d0b 100644
--- a/cpp-0-9/lib/client/ClientChannel.h
+++ b/cpp/lib/client/ClientChannel.h
diff --git a/cpp-0-9/lib/client/ClientExchange.cpp b/cpp/lib/client/ClientExchange.cpp
index 5e5f3f14c6..5e5f3f14c6 100644
--- a/cpp-0-9/lib/client/ClientExchange.cpp
+++ b/cpp/lib/client/ClientExchange.cpp
diff --git a/cpp-0-9/lib/client/ClientExchange.h b/cpp/lib/client/ClientExchange.h
index a8ac21fa9b..a8ac21fa9b 100644
--- a/cpp-0-9/lib/client/ClientExchange.h
+++ b/cpp/lib/client/ClientExchange.h
diff --git a/cpp-0-9/lib/client/ClientMessage.cpp b/cpp/lib/client/ClientMessage.cpp
index f55c4abfe6..f55c4abfe6 100644
--- a/cpp-0-9/lib/client/ClientMessage.cpp
+++ b/cpp/lib/client/ClientMessage.cpp
diff --git a/cpp-0-9/lib/client/ClientMessage.h b/cpp/lib/client/ClientMessage.h
index cb239ed4d6..cb239ed4d6 100644
--- a/cpp-0-9/lib/client/ClientMessage.h
+++ b/cpp/lib/client/ClientMessage.h
diff --git a/cpp-0-9/lib/client/ClientQueue.cpp b/cpp/lib/client/ClientQueue.cpp
index 773be504d8..773be504d8 100644
--- a/cpp-0-9/lib/client/ClientQueue.cpp
+++ b/cpp/lib/client/ClientQueue.cpp
diff --git a/cpp-0-9/lib/client/ClientQueue.h b/cpp/lib/client/ClientQueue.h
index b37a44b004..b37a44b004 100644
--- a/cpp-0-9/lib/client/ClientQueue.h
+++ b/cpp/lib/client/ClientQueue.h
diff --git a/cpp-0-9/lib/client/Connection.cpp b/cpp/lib/client/Connection.cpp
index 618f3cbc92..618f3cbc92 100644
--- a/cpp-0-9/lib/client/Connection.cpp
+++ b/cpp/lib/client/Connection.cpp
diff --git a/cpp-0-9/lib/client/Connection.h b/cpp/lib/client/Connection.h
index b4bd311511..b4bd311511 100644
--- a/cpp-0-9/lib/client/Connection.h
+++ b/cpp/lib/client/Connection.h
diff --git a/cpp-0-9/lib/client/Connector.cpp b/cpp/lib/client/Connector.cpp
index 7b73cc016a..7b73cc016a 100644
--- a/cpp-0-9/lib/client/Connector.cpp
+++ b/cpp/lib/client/Connector.cpp
diff --git a/cpp-0-9/lib/client/Connector.h b/cpp/lib/client/Connector.h
index 91234d2321..91234d2321 100644
--- a/cpp-0-9/lib/client/Connector.h
+++ b/cpp/lib/client/Connector.h
diff --git a/cpp-0-9/lib/client/IncomingMessage.cpp b/cpp/lib/client/IncomingMessage.cpp
index 07f94ceb64..07f94ceb64 100644
--- a/cpp-0-9/lib/client/IncomingMessage.cpp
+++ b/cpp/lib/client/IncomingMessage.cpp
diff --git a/cpp-0-9/lib/client/IncomingMessage.h b/cpp/lib/client/IncomingMessage.h
index 2d7c8723c5..2d7c8723c5 100644
--- a/cpp-0-9/lib/client/IncomingMessage.h
+++ b/cpp/lib/client/IncomingMessage.h
diff --git a/cpp-0-9/lib/client/Makefile.am b/cpp/lib/client/Makefile.am
index 1e10a2a244..1e10a2a244 100644
--- a/cpp-0-9/lib/client/Makefile.am
+++ b/cpp/lib/client/Makefile.am
diff --git a/cpp-0-9/lib/client/MessageListener.cpp b/cpp/lib/client/MessageListener.cpp
index 70d44e7040..70d44e7040 100644
--- a/cpp-0-9/lib/client/MessageListener.cpp
+++ b/cpp/lib/client/MessageListener.cpp
diff --git a/cpp-0-9/lib/client/MessageListener.h b/cpp/lib/client/MessageListener.h
index cfb917b4f8..cfb917b4f8 100644
--- a/cpp-0-9/lib/client/MessageListener.h
+++ b/cpp/lib/client/MessageListener.h
diff --git a/cpp-0-9/lib/client/MethodBodyInstances.h b/cpp/lib/client/MethodBodyInstances.h
index acbeeb1158..acbeeb1158 100644
--- a/cpp-0-9/lib/client/MethodBodyInstances.h
+++ b/cpp/lib/client/MethodBodyInstances.h
diff --git a/cpp-0-9/lib/client/ResponseHandler.cpp b/cpp/lib/client/ResponseHandler.cpp
index 4498de41ae..4498de41ae 100644
--- a/cpp-0-9/lib/client/ResponseHandler.cpp
+++ b/cpp/lib/client/ResponseHandler.cpp
diff --git a/cpp-0-9/lib/client/ResponseHandler.h b/cpp/lib/client/ResponseHandler.h
index d28048c3d3..d28048c3d3 100644
--- a/cpp-0-9/lib/client/ResponseHandler.h
+++ b/cpp/lib/client/ResponseHandler.h
diff --git a/cpp-0-9/lib/client/ReturnedMessageHandler.cpp b/cpp/lib/client/ReturnedMessageHandler.cpp
index ee9f7462ef..ee9f7462ef 100644
--- a/cpp-0-9/lib/client/ReturnedMessageHandler.cpp
+++ b/cpp/lib/client/ReturnedMessageHandler.cpp
diff --git a/cpp-0-9/lib/client/ReturnedMessageHandler.h b/cpp/lib/client/ReturnedMessageHandler.h
index 137f0b2e17..137f0b2e17 100644
--- a/cpp-0-9/lib/client/ReturnedMessageHandler.h
+++ b/cpp/lib/client/ReturnedMessageHandler.h
diff --git a/cpp-0-9/lib/common/Exception.cpp b/cpp/lib/common/Exception.cpp
index f7d91498e0..f7d91498e0 100644
--- a/cpp-0-9/lib/common/Exception.cpp
+++ b/cpp/lib/common/Exception.cpp
diff --git a/cpp-0-9/lib/common/Exception.h b/cpp/lib/common/Exception.h
index b8cd68cf8c..b8cd68cf8c 100644
--- a/cpp-0-9/lib/common/Exception.h
+++ b/cpp/lib/common/Exception.h
diff --git a/cpp-0-9/lib/common/ExceptionHolder.cpp b/cpp/lib/common/ExceptionHolder.cpp
index de8d7b2487..de8d7b2487 100644
--- a/cpp-0-9/lib/common/ExceptionHolder.cpp
+++ b/cpp/lib/common/ExceptionHolder.cpp
diff --git a/cpp-0-9/lib/common/ExceptionHolder.h b/cpp/lib/common/ExceptionHolder.h
index 2769455aba..2769455aba 100644
--- a/cpp-0-9/lib/common/ExceptionHolder.h
+++ b/cpp/lib/common/ExceptionHolder.h
diff --git a/cpp-0-9/lib/common/Makefile.am b/cpp/lib/common/Makefile.am
index d70adf1186..d70adf1186 100644
--- a/cpp-0-9/lib/common/Makefile.am
+++ b/cpp/lib/common/Makefile.am
diff --git a/cpp-0-9/lib/common/QpidError.cpp b/cpp/lib/common/QpidError.cpp
index 9cd3051d1e..9cd3051d1e 100644
--- a/cpp-0-9/lib/common/QpidError.cpp
+++ b/cpp/lib/common/QpidError.cpp
diff --git a/cpp-0-9/lib/common/QpidError.h b/cpp/lib/common/QpidError.h
index 2a0395ab79..2a0395ab79 100644
--- a/cpp-0-9/lib/common/QpidError.h
+++ b/cpp/lib/common/QpidError.h
diff --git a/cpp-0-9/lib/common/SharedObject.h b/cpp/lib/common/SharedObject.h
index 852a036ab9..852a036ab9 100644
--- a/cpp-0-9/lib/common/SharedObject.h
+++ b/cpp/lib/common/SharedObject.h
diff --git a/cpp-0-9/lib/common/doxygen_mainpage.h b/cpp/lib/common/doxygen_mainpage.h
index b354238cd0..b354238cd0 100644
--- a/cpp-0-9/lib/common/doxygen_mainpage.h
+++ b/cpp/lib/common/doxygen_mainpage.h
diff --git a/cpp-0-9/lib/common/framing/AMQBody.cpp b/cpp/lib/common/framing/AMQBody.cpp
index c7c253beda..c7c253beda 100644
--- a/cpp-0-9/lib/common/framing/AMQBody.cpp
+++ b/cpp/lib/common/framing/AMQBody.cpp
diff --git a/cpp-0-9/lib/common/framing/AMQBody.h b/cpp/lib/common/framing/AMQBody.h
index 26076956ca..26076956ca 100644
--- a/cpp-0-9/lib/common/framing/AMQBody.h
+++ b/cpp/lib/common/framing/AMQBody.h
diff --git a/cpp-0-9/lib/common/framing/AMQContentBody.cpp b/cpp/lib/common/framing/AMQContentBody.cpp
index 573c17dade..573c17dade 100644
--- a/cpp-0-9/lib/common/framing/AMQContentBody.cpp
+++ b/cpp/lib/common/framing/AMQContentBody.cpp
diff --git a/cpp-0-9/lib/common/framing/AMQContentBody.h b/cpp/lib/common/framing/AMQContentBody.h
index c9fa7cde5c..c9fa7cde5c 100644
--- a/cpp-0-9/lib/common/framing/AMQContentBody.h
+++ b/cpp/lib/common/framing/AMQContentBody.h
diff --git a/cpp-0-9/lib/common/framing/AMQDataBlock.h b/cpp/lib/common/framing/AMQDataBlock.h
index 2a6f843f1e..2a6f843f1e 100644
--- a/cpp-0-9/lib/common/framing/AMQDataBlock.h
+++ b/cpp/lib/common/framing/AMQDataBlock.h
diff --git a/cpp-0-9/lib/common/framing/AMQFrame.cpp b/cpp/lib/common/framing/AMQFrame.cpp
index bc9061b169..bc9061b169 100644
--- a/cpp-0-9/lib/common/framing/AMQFrame.cpp
+++ b/cpp/lib/common/framing/AMQFrame.cpp
diff --git a/cpp-0-9/lib/common/framing/AMQFrame.h b/cpp/lib/common/framing/AMQFrame.h
index 0c18e0c2a5..0c18e0c2a5 100644
--- a/cpp-0-9/lib/common/framing/AMQFrame.h
+++ b/cpp/lib/common/framing/AMQFrame.h
diff --git a/cpp-0-9/lib/common/framing/AMQHeaderBody.cpp b/cpp/lib/common/framing/AMQHeaderBody.cpp
index 3ddae4eebf..3ddae4eebf 100644
--- a/cpp-0-9/lib/common/framing/AMQHeaderBody.cpp
+++ b/cpp/lib/common/framing/AMQHeaderBody.cpp
diff --git a/cpp-0-9/lib/common/framing/AMQHeaderBody.h b/cpp/lib/common/framing/AMQHeaderBody.h
index d57f93aacd..d57f93aacd 100644
--- a/cpp-0-9/lib/common/framing/AMQHeaderBody.h
+++ b/cpp/lib/common/framing/AMQHeaderBody.h
diff --git a/cpp-0-9/lib/common/framing/AMQHeartbeatBody.cpp b/cpp/lib/common/framing/AMQHeartbeatBody.cpp
index 63f83a3d29..63f83a3d29 100644
--- a/cpp-0-9/lib/common/framing/AMQHeartbeatBody.cpp
+++ b/cpp/lib/common/framing/AMQHeartbeatBody.cpp
diff --git a/cpp-0-9/lib/common/framing/AMQHeartbeatBody.h b/cpp/lib/common/framing/AMQHeartbeatBody.h
index a3e9d823f1..a3e9d823f1 100644
--- a/cpp-0-9/lib/common/framing/AMQHeartbeatBody.h
+++ b/cpp/lib/common/framing/AMQHeartbeatBody.h
diff --git a/cpp-0-9/lib/common/framing/AMQMethodBody.cpp b/cpp/lib/common/framing/AMQMethodBody.cpp
index 23502068f5..23502068f5 100644
--- a/cpp-0-9/lib/common/framing/AMQMethodBody.cpp
+++ b/cpp/lib/common/framing/AMQMethodBody.cpp
diff --git a/cpp-0-9/lib/common/framing/AMQMethodBody.h b/cpp/lib/common/framing/AMQMethodBody.h
index c2b00c2169..c2b00c2169 100644
--- a/cpp-0-9/lib/common/framing/AMQMethodBody.h
+++ b/cpp/lib/common/framing/AMQMethodBody.h
diff --git a/cpp-0-9/lib/common/framing/AMQRequestBody.cpp b/cpp/lib/common/framing/AMQRequestBody.cpp
index 54e1c11863..54e1c11863 100644
--- a/cpp-0-9/lib/common/framing/AMQRequestBody.cpp
+++ b/cpp/lib/common/framing/AMQRequestBody.cpp
diff --git a/cpp-0-9/lib/common/framing/AMQRequestBody.h b/cpp/lib/common/framing/AMQRequestBody.h
index e184fff1d6..e184fff1d6 100644
--- a/cpp-0-9/lib/common/framing/AMQRequestBody.h
+++ b/cpp/lib/common/framing/AMQRequestBody.h
diff --git a/cpp-0-9/lib/common/framing/AMQResponseBody.cpp b/cpp/lib/common/framing/AMQResponseBody.cpp
index 7da71a5d25..7da71a5d25 100644
--- a/cpp-0-9/lib/common/framing/AMQResponseBody.cpp
+++ b/cpp/lib/common/framing/AMQResponseBody.cpp
diff --git a/cpp-0-9/lib/common/framing/AMQResponseBody.h b/cpp/lib/common/framing/AMQResponseBody.h
index fa381baddd..fa381baddd 100644
--- a/cpp-0-9/lib/common/framing/AMQResponseBody.h
+++ b/cpp/lib/common/framing/AMQResponseBody.h
diff --git a/cpp-0-9/lib/common/framing/BasicHeaderProperties.cpp b/cpp/lib/common/framing/BasicHeaderProperties.cpp
index 930ec9f4dd..930ec9f4dd 100644
--- a/cpp-0-9/lib/common/framing/BasicHeaderProperties.cpp
+++ b/cpp/lib/common/framing/BasicHeaderProperties.cpp
diff --git a/cpp-0-9/lib/common/framing/BasicHeaderProperties.h b/cpp/lib/common/framing/BasicHeaderProperties.h
index 1f3fd31250..1f3fd31250 100644
--- a/cpp-0-9/lib/common/framing/BasicHeaderProperties.h
+++ b/cpp/lib/common/framing/BasicHeaderProperties.h
diff --git a/cpp-0-9/lib/common/framing/BodyHandler.cpp b/cpp/lib/common/framing/BodyHandler.cpp
index 5dd0c0c23d..5dd0c0c23d 100644
--- a/cpp-0-9/lib/common/framing/BodyHandler.cpp
+++ b/cpp/lib/common/framing/BodyHandler.cpp
diff --git a/cpp-0-9/lib/common/framing/BodyHandler.h b/cpp/lib/common/framing/BodyHandler.h
index cb3f0997b0..cb3f0997b0 100644
--- a/cpp-0-9/lib/common/framing/BodyHandler.h
+++ b/cpp/lib/common/framing/BodyHandler.h
diff --git a/cpp-0-9/lib/common/framing/Buffer.cpp b/cpp/lib/common/framing/Buffer.cpp
index 52c9a42d55..52c9a42d55 100644
--- a/cpp-0-9/lib/common/framing/Buffer.cpp
+++ b/cpp/lib/common/framing/Buffer.cpp
diff --git a/cpp-0-9/lib/common/framing/Buffer.h b/cpp/lib/common/framing/Buffer.h
index 63a15c7c3d..63a15c7c3d 100644
--- a/cpp-0-9/lib/common/framing/Buffer.h
+++ b/cpp/lib/common/framing/Buffer.h
diff --git a/cpp-0-9/lib/common/framing/ChannelAdapter.cpp b/cpp/lib/common/framing/ChannelAdapter.cpp
index 8a1ff39ee5..8a1ff39ee5 100644
--- a/cpp-0-9/lib/common/framing/ChannelAdapter.cpp
+++ b/cpp/lib/common/framing/ChannelAdapter.cpp
diff --git a/cpp-0-9/lib/common/framing/ChannelAdapter.h b/cpp/lib/common/framing/ChannelAdapter.h
index f6e3986eed..f6e3986eed 100644
--- a/cpp-0-9/lib/common/framing/ChannelAdapter.h
+++ b/cpp/lib/common/framing/ChannelAdapter.h
diff --git a/cpp-0-9/lib/common/framing/FieldTable.cpp b/cpp/lib/common/framing/FieldTable.cpp
index 5bbc4651d3..5bbc4651d3 100644
--- a/cpp-0-9/lib/common/framing/FieldTable.cpp
+++ b/cpp/lib/common/framing/FieldTable.cpp
diff --git a/cpp-0-9/lib/common/framing/FieldTable.h b/cpp/lib/common/framing/FieldTable.h
index e25a7d3f8c..e25a7d3f8c 100644
--- a/cpp-0-9/lib/common/framing/FieldTable.h
+++ b/cpp/lib/common/framing/FieldTable.h
diff --git a/cpp-0-9/lib/common/framing/FramingContent.cpp b/cpp/lib/common/framing/FramingContent.cpp
index 24efa38dcb..24efa38dcb 100644
--- a/cpp-0-9/lib/common/framing/FramingContent.cpp
+++ b/cpp/lib/common/framing/FramingContent.cpp
diff --git a/cpp-0-9/lib/common/framing/FramingContent.h b/cpp/lib/common/framing/FramingContent.h
index 696bcc7c1a..696bcc7c1a 100644
--- a/cpp-0-9/lib/common/framing/FramingContent.h
+++ b/cpp/lib/common/framing/FramingContent.h
diff --git a/cpp-0-9/lib/common/framing/HeaderProperties.h b/cpp/lib/common/framing/HeaderProperties.h
index 1ec4840309..1ec4840309 100644
--- a/cpp-0-9/lib/common/framing/HeaderProperties.h
+++ b/cpp/lib/common/framing/HeaderProperties.h
diff --git a/cpp-0-9/lib/common/framing/InitiationHandler.cpp b/cpp/lib/common/framing/InitiationHandler.cpp
index dd92c9859b..dd92c9859b 100644
--- a/cpp-0-9/lib/common/framing/InitiationHandler.cpp
+++ b/cpp/lib/common/framing/InitiationHandler.cpp
diff --git a/cpp-0-9/lib/common/framing/InitiationHandler.h b/cpp/lib/common/framing/InitiationHandler.h
index d94fc58d2c..d94fc58d2c 100644
--- a/cpp-0-9/lib/common/framing/InitiationHandler.h
+++ b/cpp/lib/common/framing/InitiationHandler.h
diff --git a/cpp-0-9/lib/common/framing/InputHandler.h b/cpp/lib/common/framing/InputHandler.h
index 4e2d4bcc9b..4e2d4bcc9b 100644
--- a/cpp-0-9/lib/common/framing/InputHandler.h
+++ b/cpp/lib/common/framing/InputHandler.h
diff --git a/cpp-0-9/lib/common/framing/MethodContext.cpp b/cpp/lib/common/framing/MethodContext.cpp
index 73af73f8e5..73af73f8e5 100644
--- a/cpp-0-9/lib/common/framing/MethodContext.cpp
+++ b/cpp/lib/common/framing/MethodContext.cpp
diff --git a/cpp-0-9/lib/common/framing/MethodContext.h b/cpp/lib/common/framing/MethodContext.h
index 3493924bf6..3493924bf6 100644
--- a/cpp-0-9/lib/common/framing/MethodContext.h
+++ b/cpp/lib/common/framing/MethodContext.h
diff --git a/cpp-0-9/lib/common/framing/OutputHandler.h b/cpp/lib/common/framing/OutputHandler.h
index 9ffd4227d8..9ffd4227d8 100644
--- a/cpp-0-9/lib/common/framing/OutputHandler.h
+++ b/cpp/lib/common/framing/OutputHandler.h
diff --git a/cpp-0-9/lib/common/framing/ProtocolInitiation.cpp b/cpp/lib/common/framing/ProtocolInitiation.cpp
index de53488f7b..de53488f7b 100644
--- a/cpp-0-9/lib/common/framing/ProtocolInitiation.cpp
+++ b/cpp/lib/common/framing/ProtocolInitiation.cpp
diff --git a/cpp-0-9/lib/common/framing/ProtocolInitiation.h b/cpp/lib/common/framing/ProtocolInitiation.h
index ed7b59e94e..ed7b59e94e 100644
--- a/cpp-0-9/lib/common/framing/ProtocolInitiation.h
+++ b/cpp/lib/common/framing/ProtocolInitiation.h
diff --git a/cpp-0-9/lib/common/framing/ProtocolVersion.cpp b/cpp/lib/common/framing/ProtocolVersion.cpp
index fd4b1a645f..fd4b1a645f 100644
--- a/cpp-0-9/lib/common/framing/ProtocolVersion.cpp
+++ b/cpp/lib/common/framing/ProtocolVersion.cpp
diff --git a/cpp-0-9/lib/common/framing/ProtocolVersion.h b/cpp/lib/common/framing/ProtocolVersion.h
index 5e1429c1ea..5e1429c1ea 100644
--- a/cpp-0-9/lib/common/framing/ProtocolVersion.h
+++ b/cpp/lib/common/framing/ProtocolVersion.h
diff --git a/cpp-0-9/lib/common/framing/ProtocolVersionException.cpp b/cpp/lib/common/framing/ProtocolVersionException.cpp
index 9088422f6f..9088422f6f 100644
--- a/cpp-0-9/lib/common/framing/ProtocolVersionException.cpp
+++ b/cpp/lib/common/framing/ProtocolVersionException.cpp
diff --git a/cpp-0-9/lib/common/framing/ProtocolVersionException.h b/cpp/lib/common/framing/ProtocolVersionException.h
index 8e2de8b843..8e2de8b843 100644
--- a/cpp-0-9/lib/common/framing/ProtocolVersionException.h
+++ b/cpp/lib/common/framing/ProtocolVersionException.h
diff --git a/cpp-0-9/lib/common/framing/Proxy.cpp b/cpp/lib/common/framing/Proxy.cpp
index 0b2a882a49..0b2a882a49 100644
--- a/cpp-0-9/lib/common/framing/Proxy.cpp
+++ b/cpp/lib/common/framing/Proxy.cpp
diff --git a/cpp-0-9/lib/common/framing/Proxy.h b/cpp/lib/common/framing/Proxy.h
index 8ed46ed748..8ed46ed748 100644
--- a/cpp-0-9/lib/common/framing/Proxy.h
+++ b/cpp/lib/common/framing/Proxy.h
diff --git a/cpp-0-9/lib/common/framing/Requester.cpp b/cpp/lib/common/framing/Requester.cpp
index 9ee809e2ee..9ee809e2ee 100644
--- a/cpp-0-9/lib/common/framing/Requester.cpp
+++ b/cpp/lib/common/framing/Requester.cpp
diff --git a/cpp-0-9/lib/common/framing/Requester.h b/cpp/lib/common/framing/Requester.h
index dcc4460041..dcc4460041 100644
--- a/cpp-0-9/lib/common/framing/Requester.h
+++ b/cpp/lib/common/framing/Requester.h
diff --git a/cpp-0-9/lib/common/framing/Responder.cpp b/cpp/lib/common/framing/Responder.cpp
index c8c5ce8dcc..c8c5ce8dcc 100644
--- a/cpp-0-9/lib/common/framing/Responder.cpp
+++ b/cpp/lib/common/framing/Responder.cpp
diff --git a/cpp-0-9/lib/common/framing/Responder.h b/cpp/lib/common/framing/Responder.h
index 0e1785256b..0e1785256b 100644
--- a/cpp-0-9/lib/common/framing/Responder.h
+++ b/cpp/lib/common/framing/Responder.h
diff --git a/cpp-0-9/lib/common/framing/Value.cpp b/cpp/lib/common/framing/Value.cpp
index 03e005e384..03e005e384 100644
--- a/cpp-0-9/lib/common/framing/Value.cpp
+++ b/cpp/lib/common/framing/Value.cpp
diff --git a/cpp-0-9/lib/common/framing/Value.h b/cpp/lib/common/framing/Value.h
index 8752b02f40..8752b02f40 100644
--- a/cpp-0-9/lib/common/framing/Value.h
+++ b/cpp/lib/common/framing/Value.h
diff --git a/cpp-0-9/lib/common/framing/amqp_framing.h b/cpp/lib/common/framing/amqp_framing.h
index 62f87352f8..62f87352f8 100644
--- a/cpp-0-9/lib/common/framing/amqp_framing.h
+++ b/cpp/lib/common/framing/amqp_framing.h
diff --git a/cpp-0-9/lib/common/framing/amqp_types.h b/cpp/lib/common/framing/amqp_types.h
index 49963bd570..49963bd570 100644
--- a/cpp-0-9/lib/common/framing/amqp_types.h
+++ b/cpp/lib/common/framing/amqp_types.h
diff --git a/cpp-0-9/lib/common/framing/amqp_types_full.h b/cpp/lib/common/framing/amqp_types_full.h
index 6a24a99d38..6a24a99d38 100644
--- a/cpp-0-9/lib/common/framing/amqp_types_full.h
+++ b/cpp/lib/common/framing/amqp_types_full.h
diff --git a/cpp-0-9/lib/common/sys/Acceptor.h b/cpp/lib/common/sys/Acceptor.h
index f571dcbddd..f571dcbddd 100644
--- a/cpp-0-9/lib/common/sys/Acceptor.h
+++ b/cpp/lib/common/sys/Acceptor.h
diff --git a/cpp-0-9/lib/common/sys/AtomicCount.h b/cpp/lib/common/sys/AtomicCount.h
index 63670cbf00..63670cbf00 100644
--- a/cpp-0-9/lib/common/sys/AtomicCount.h
+++ b/cpp/lib/common/sys/AtomicCount.h
diff --git a/cpp-0-9/lib/common/sys/Condition.h b/cpp/lib/common/sys/Condition.h
index 9d70af5b84..9d70af5b84 100644
--- a/cpp-0-9/lib/common/sys/Condition.h
+++ b/cpp/lib/common/sys/Condition.h
diff --git a/cpp-0-9/lib/common/sys/ConnectionInputHandler.h b/cpp/lib/common/sys/ConnectionInputHandler.h
index fa70dfaf48..fa70dfaf48 100644
--- a/cpp-0-9/lib/common/sys/ConnectionInputHandler.h
+++ b/cpp/lib/common/sys/ConnectionInputHandler.h
diff --git a/cpp-0-9/lib/common/sys/ConnectionInputHandlerFactory.h b/cpp/lib/common/sys/ConnectionInputHandlerFactory.h
index af7d411928..af7d411928 100644
--- a/cpp-0-9/lib/common/sys/ConnectionInputHandlerFactory.h
+++ b/cpp/lib/common/sys/ConnectionInputHandlerFactory.h
diff --git a/cpp-0-9/lib/common/sys/ConnectionOutputHandler.h b/cpp/lib/common/sys/ConnectionOutputHandler.h
index 91849e1dfb..91849e1dfb 100644
--- a/cpp-0-9/lib/common/sys/ConnectionOutputHandler.h
+++ b/cpp/lib/common/sys/ConnectionOutputHandler.h
diff --git a/cpp-0-9/lib/common/sys/Module.h b/cpp/lib/common/sys/Module.h
index 9bf5d6e1fc..9bf5d6e1fc 100644
--- a/cpp-0-9/lib/common/sys/Module.h
+++ b/cpp/lib/common/sys/Module.h
diff --git a/cpp-0-9/lib/common/sys/Monitor.h b/cpp/lib/common/sys/Monitor.h
index a3bbd3c5aa..a3bbd3c5aa 100644
--- a/cpp-0-9/lib/common/sys/Monitor.h
+++ b/cpp/lib/common/sys/Monitor.h
diff --git a/cpp-0-9/lib/common/sys/Mutex.h b/cpp/lib/common/sys/Mutex.h
index 9db9be0981..9db9be0981 100644
--- a/cpp-0-9/lib/common/sys/Mutex.h
+++ b/cpp/lib/common/sys/Mutex.h
diff --git a/cpp-0-9/lib/common/sys/ProducerConsumer.cpp b/cpp/lib/common/sys/ProducerConsumer.cpp
index 3f6156f230..3f6156f230 100644
--- a/cpp-0-9/lib/common/sys/ProducerConsumer.cpp
+++ b/cpp/lib/common/sys/ProducerConsumer.cpp
diff --git a/cpp-0-9/lib/common/sys/ProducerConsumer.h b/cpp/lib/common/sys/ProducerConsumer.h
index 742639323b..742639323b 100644
--- a/cpp-0-9/lib/common/sys/ProducerConsumer.h
+++ b/cpp/lib/common/sys/ProducerConsumer.h
diff --git a/cpp-0-9/lib/common/sys/Runnable.cpp b/cpp/lib/common/sys/Runnable.cpp
index 30122c682f..30122c682f 100644
--- a/cpp-0-9/lib/common/sys/Runnable.cpp
+++ b/cpp/lib/common/sys/Runnable.cpp
diff --git a/cpp-0-9/lib/common/sys/Runnable.h b/cpp/lib/common/sys/Runnable.h
index fb3927c612..fb3927c612 100644
--- a/cpp-0-9/lib/common/sys/Runnable.h
+++ b/cpp/lib/common/sys/Runnable.h
diff --git a/cpp-0-9/lib/common/sys/ScopedIncrement.h b/cpp/lib/common/sys/ScopedIncrement.h
index f14461ddaf..f14461ddaf 100644
--- a/cpp-0-9/lib/common/sys/ScopedIncrement.h
+++ b/cpp/lib/common/sys/ScopedIncrement.h
diff --git a/cpp-0-9/lib/common/sys/ShutdownHandler.h b/cpp/lib/common/sys/ShutdownHandler.h
index 88baecb5b6..88baecb5b6 100644
--- a/cpp-0-9/lib/common/sys/ShutdownHandler.h
+++ b/cpp/lib/common/sys/ShutdownHandler.h
diff --git a/cpp-0-9/lib/common/sys/Socket.h b/cpp/lib/common/sys/Socket.h
index d793a240c6..d793a240c6 100644
--- a/cpp-0-9/lib/common/sys/Socket.h
+++ b/cpp/lib/common/sys/Socket.h
diff --git a/cpp-0-9/lib/common/sys/Thread.h b/cpp/lib/common/sys/Thread.h
index 47b95b6234..47b95b6234 100644
--- a/cpp-0-9/lib/common/sys/Thread.h
+++ b/cpp/lib/common/sys/Thread.h
diff --git a/cpp-0-9/lib/common/sys/ThreadSafeQueue.h b/cpp/lib/common/sys/ThreadSafeQueue.h
index ff949a3e16..ff949a3e16 100644
--- a/cpp-0-9/lib/common/sys/ThreadSafeQueue.h
+++ b/cpp/lib/common/sys/ThreadSafeQueue.h
diff --git a/cpp-0-9/lib/common/sys/Time.cpp b/cpp/lib/common/sys/Time.cpp
index ad6185b966..ad6185b966 100644
--- a/cpp-0-9/lib/common/sys/Time.cpp
+++ b/cpp/lib/common/sys/Time.cpp
diff --git a/cpp-0-9/lib/common/sys/Time.h b/cpp/lib/common/sys/Time.h
index 3dd46741d8..3dd46741d8 100644
--- a/cpp-0-9/lib/common/sys/Time.h
+++ b/cpp/lib/common/sys/Time.h
diff --git a/cpp-0-9/lib/common/sys/TimeoutHandler.h b/cpp/lib/common/sys/TimeoutHandler.h
index 0c10709bbf..0c10709bbf 100644
--- a/cpp-0-9/lib/common/sys/TimeoutHandler.h
+++ b/cpp/lib/common/sys/TimeoutHandler.h
diff --git a/cpp-0-9/lib/common/sys/apr/APRAcceptor.cpp b/cpp/lib/common/sys/apr/APRAcceptor.cpp
index 52384857ed..52384857ed 100644
--- a/cpp-0-9/lib/common/sys/apr/APRAcceptor.cpp
+++ b/cpp/lib/common/sys/apr/APRAcceptor.cpp
diff --git a/cpp-0-9/lib/common/sys/apr/APRBase.cpp b/cpp/lib/common/sys/apr/APRBase.cpp
index 861071499f..861071499f 100644
--- a/cpp-0-9/lib/common/sys/apr/APRBase.cpp
+++ b/cpp/lib/common/sys/apr/APRBase.cpp
diff --git a/cpp-0-9/lib/common/sys/apr/APRBase.h b/cpp/lib/common/sys/apr/APRBase.h
index 6a866a554a..6a866a554a 100644
--- a/cpp-0-9/lib/common/sys/apr/APRBase.h
+++ b/cpp/lib/common/sys/apr/APRBase.h
diff --git a/cpp-0-9/lib/common/sys/apr/APRPool.cpp b/cpp/lib/common/sys/apr/APRPool.cpp
index e8b71f6e8a..e8b71f6e8a 100644
--- a/cpp-0-9/lib/common/sys/apr/APRPool.cpp
+++ b/cpp/lib/common/sys/apr/APRPool.cpp
diff --git a/cpp-0-9/lib/common/sys/apr/APRPool.h b/cpp/lib/common/sys/apr/APRPool.h
index da7661fcfa..da7661fcfa 100644
--- a/cpp-0-9/lib/common/sys/apr/APRPool.h
+++ b/cpp/lib/common/sys/apr/APRPool.h
diff --git a/cpp-0-9/lib/common/sys/apr/APRSocket.cpp b/cpp/lib/common/sys/apr/APRSocket.cpp
index 96dbd132a1..96dbd132a1 100644
--- a/cpp-0-9/lib/common/sys/apr/APRSocket.cpp
+++ b/cpp/lib/common/sys/apr/APRSocket.cpp
diff --git a/cpp-0-9/lib/common/sys/apr/APRSocket.h b/cpp/lib/common/sys/apr/APRSocket.h
index a55dfc06b0..a55dfc06b0 100644
--- a/cpp-0-9/lib/common/sys/apr/APRSocket.h
+++ b/cpp/lib/common/sys/apr/APRSocket.h
diff --git a/cpp-0-9/lib/common/sys/apr/LFProcessor.cpp b/cpp/lib/common/sys/apr/LFProcessor.cpp
index 2b6fc92623..2b6fc92623 100644
--- a/cpp-0-9/lib/common/sys/apr/LFProcessor.cpp
+++ b/cpp/lib/common/sys/apr/LFProcessor.cpp
diff --git a/cpp-0-9/lib/common/sys/apr/LFProcessor.h b/cpp/lib/common/sys/apr/LFProcessor.h
index de90199472..de90199472 100644
--- a/cpp-0-9/lib/common/sys/apr/LFProcessor.h
+++ b/cpp/lib/common/sys/apr/LFProcessor.h
diff --git a/cpp-0-9/lib/common/sys/apr/LFSessionContext.cpp b/cpp/lib/common/sys/apr/LFSessionContext.cpp
index 503dfddbb7..503dfddbb7 100644
--- a/cpp-0-9/lib/common/sys/apr/LFSessionContext.cpp
+++ b/cpp/lib/common/sys/apr/LFSessionContext.cpp
diff --git a/cpp-0-9/lib/common/sys/apr/LFSessionContext.h b/cpp/lib/common/sys/apr/LFSessionContext.h
index 81cfc0efda..81cfc0efda 100644
--- a/cpp-0-9/lib/common/sys/apr/LFSessionContext.h
+++ b/cpp/lib/common/sys/apr/LFSessionContext.h
diff --git a/cpp-0-9/lib/common/sys/apr/Socket.cpp b/cpp/lib/common/sys/apr/Socket.cpp
index bca4da6c96..bca4da6c96 100644
--- a/cpp-0-9/lib/common/sys/apr/Socket.cpp
+++ b/cpp/lib/common/sys/apr/Socket.cpp
diff --git a/cpp-0-9/lib/common/sys/apr/Thread.cpp b/cpp/lib/common/sys/apr/Thread.cpp
index 5c4799aa96..5c4799aa96 100644
--- a/cpp-0-9/lib/common/sys/apr/Thread.cpp
+++ b/cpp/lib/common/sys/apr/Thread.cpp
diff --git a/cpp-0-9/lib/common/sys/posix/EventChannel.cpp b/cpp/lib/common/sys/posix/EventChannel.cpp
index 16c7ec9c3f..16c7ec9c3f 100644
--- a/cpp-0-9/lib/common/sys/posix/EventChannel.cpp
+++ b/cpp/lib/common/sys/posix/EventChannel.cpp
diff --git a/cpp-0-9/lib/common/sys/posix/EventChannel.h b/cpp/lib/common/sys/posix/EventChannel.h
index 49c7fce740..49c7fce740 100644
--- a/cpp-0-9/lib/common/sys/posix/EventChannel.h
+++ b/cpp/lib/common/sys/posix/EventChannel.h
diff --git a/cpp-0-9/lib/common/sys/posix/EventChannelAcceptor.cpp b/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp
index 548fbd1881..548fbd1881 100644
--- a/cpp-0-9/lib/common/sys/posix/EventChannelAcceptor.cpp
+++ b/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp
diff --git a/cpp-0-9/lib/common/sys/posix/EventChannelConnection.cpp b/cpp/lib/common/sys/posix/EventChannelConnection.cpp
index 4449dc3035..4449dc3035 100644
--- a/cpp-0-9/lib/common/sys/posix/EventChannelConnection.cpp
+++ b/cpp/lib/common/sys/posix/EventChannelConnection.cpp
diff --git a/cpp-0-9/lib/common/sys/posix/EventChannelConnection.h b/cpp/lib/common/sys/posix/EventChannelConnection.h
index da7b6dca27..da7b6dca27 100644
--- a/cpp-0-9/lib/common/sys/posix/EventChannelConnection.h
+++ b/cpp/lib/common/sys/posix/EventChannelConnection.h
diff --git a/cpp-0-9/lib/common/sys/posix/EventChannelThreads.cpp b/cpp/lib/common/sys/posix/EventChannelThreads.cpp
index 95e699e0b0..95e699e0b0 100644
--- a/cpp-0-9/lib/common/sys/posix/EventChannelThreads.cpp
+++ b/cpp/lib/common/sys/posix/EventChannelThreads.cpp
diff --git a/cpp-0-9/lib/common/sys/posix/EventChannelThreads.h b/cpp/lib/common/sys/posix/EventChannelThreads.h
index 98403c0869..98403c0869 100644
--- a/cpp-0-9/lib/common/sys/posix/EventChannelThreads.h
+++ b/cpp/lib/common/sys/posix/EventChannelThreads.h
diff --git a/cpp-0-9/lib/common/sys/posix/PosixAcceptor.cpp b/cpp/lib/common/sys/posix/PosixAcceptor.cpp
index a80a6c61f7..a80a6c61f7 100644
--- a/cpp-0-9/lib/common/sys/posix/PosixAcceptor.cpp
+++ b/cpp/lib/common/sys/posix/PosixAcceptor.cpp
diff --git a/cpp-0-9/lib/common/sys/posix/Socket.cpp b/cpp/lib/common/sys/posix/Socket.cpp
index 5bd13742f6..5bd13742f6 100644
--- a/cpp-0-9/lib/common/sys/posix/Socket.cpp
+++ b/cpp/lib/common/sys/posix/Socket.cpp
diff --git a/cpp-0-9/lib/common/sys/posix/Thread.cpp b/cpp/lib/common/sys/posix/Thread.cpp
index f524799556..f524799556 100644
--- a/cpp-0-9/lib/common/sys/posix/Thread.cpp
+++ b/cpp/lib/common/sys/posix/Thread.cpp
diff --git a/cpp-0-9/lib/common/sys/posix/check.cpp b/cpp/lib/common/sys/posix/check.cpp
index 408679caa8..408679caa8 100644
--- a/cpp-0-9/lib/common/sys/posix/check.cpp
+++ b/cpp/lib/common/sys/posix/check.cpp
diff --git a/cpp-0-9/lib/common/sys/posix/check.h b/cpp/lib/common/sys/posix/check.h
index 57b5a5757c..57b5a5757c 100644
--- a/cpp-0-9/lib/common/sys/posix/check.h
+++ b/cpp/lib/common/sys/posix/check.h
diff --git a/cpp-0-9/m4/clock_time.m4 b/cpp/m4/clock_time.m4
index 227a5978e5..227a5978e5 100644
--- a/cpp-0-9/m4/clock_time.m4
+++ b/cpp/m4/clock_time.m4
diff --git a/cpp-0-9/m4/compiler-flags.m4 b/cpp/m4/compiler-flags.m4
index 01cb728f02..01cb728f02 100644
--- a/cpp-0-9/m4/compiler-flags.m4
+++ b/cpp/m4/compiler-flags.m4
diff --git a/cpp-0-9/m4/cppunit.m4 b/cpp/m4/cppunit.m4
index f009086f9d..f009086f9d 100644
--- a/cpp-0-9/m4/cppunit.m4
+++ b/cpp/m4/cppunit.m4
diff --git a/cpp-0-9/m4/extensions.m4 b/cpp/m4/extensions.m4
index 143a9e5403..143a9e5403 100644
--- a/cpp-0-9/m4/extensions.m4
+++ b/cpp/m4/extensions.m4
diff --git a/cpp-0-9/make-dist b/cpp/make-dist
index c23cad63a1..c23cad63a1 100755
--- a/cpp-0-9/make-dist
+++ b/cpp/make-dist
diff --git a/cpp-0-9/qpid-autotools-install b/cpp/qpid-autotools-install
index 2ed3174903..2ed3174903 100755
--- a/cpp-0-9/qpid-autotools-install
+++ b/cpp/qpid-autotools-install
diff --git a/cpp-0-9/qpidc.spec.in b/cpp/qpidc.spec.in
index 9b7cb4ef91..9b7cb4ef91 100644
--- a/cpp-0-9/qpidc.spec.in
+++ b/cpp/qpidc.spec.in
diff --git a/cpp-0-9/rpm/Makefile.am b/cpp/rpm/Makefile.am
index 363a444f4f..363a444f4f 100644
--- a/cpp-0-9/rpm/Makefile.am
+++ b/cpp/rpm/Makefile.am
diff --git a/cpp-0-9/src/Makefile.am b/cpp/src/Makefile.am
index 40398eb2c9..40398eb2c9 100644
--- a/cpp-0-9/src/Makefile.am
+++ b/cpp/src/Makefile.am
diff --git a/cpp-0-9/src/qpidd.cpp b/cpp/src/qpidd.cpp
index 9f658ebf74..9f658ebf74 100644
--- a/cpp-0-9/src/qpidd.cpp
+++ b/cpp/src/qpidd.cpp
diff --git a/cpp-0-9/tests/.vg-supp b/cpp/tests/.vg-supp
index e107377aa2..e107377aa2 100644
--- a/cpp-0-9/tests/.vg-supp
+++ b/cpp/tests/.vg-supp
diff --git a/cpp-0-9/tests/APRBaseTest.cpp b/cpp/tests/APRBaseTest.cpp
index 7d95c3bf52..7d95c3bf52 100644
--- a/cpp-0-9/tests/APRBaseTest.cpp
+++ b/cpp/tests/APRBaseTest.cpp
diff --git a/cpp-0-9/tests/AcceptorTest.cpp b/cpp/tests/AcceptorTest.cpp
index 34a51888d4..34a51888d4 100644
--- a/cpp-0-9/tests/AcceptorTest.cpp
+++ b/cpp/tests/AcceptorTest.cpp
diff --git a/cpp-0-9/tests/AccumulatedAckTest.cpp b/cpp/tests/AccumulatedAckTest.cpp
index 30554f808e..30554f808e 100644
--- a/cpp-0-9/tests/AccumulatedAckTest.cpp
+++ b/cpp/tests/AccumulatedAckTest.cpp
diff --git a/cpp-0-9/tests/BrokerChannelTest.cpp b/cpp/tests/BrokerChannelTest.cpp
index 9216ae4672..9216ae4672 100644
--- a/cpp-0-9/tests/BrokerChannelTest.cpp
+++ b/cpp/tests/BrokerChannelTest.cpp
diff --git a/cpp-0-9/tests/ClientChannelTest.cpp b/cpp/tests/ClientChannelTest.cpp
index 7b0bc363fe..7b0bc363fe 100644
--- a/cpp-0-9/tests/ClientChannelTest.cpp
+++ b/cpp/tests/ClientChannelTest.cpp
diff --git a/cpp-0-9/tests/ConfigurationTest.cpp b/cpp/tests/ConfigurationTest.cpp
index 3a1d5ba85d..3a1d5ba85d 100644
--- a/cpp-0-9/tests/ConfigurationTest.cpp
+++ b/cpp/tests/ConfigurationTest.cpp
diff --git a/cpp-0-9/tests/EventChannelConnectionTest.cpp b/cpp/tests/EventChannelConnectionTest.cpp
index 66561daf83..66561daf83 100644
--- a/cpp-0-9/tests/EventChannelConnectionTest.cpp
+++ b/cpp/tests/EventChannelConnectionTest.cpp
diff --git a/cpp-0-9/tests/EventChannelTest.cpp b/cpp/tests/EventChannelTest.cpp
index 8e5c724a15..8e5c724a15 100644
--- a/cpp-0-9/tests/EventChannelTest.cpp
+++ b/cpp/tests/EventChannelTest.cpp
diff --git a/cpp-0-9/tests/EventChannelThreadsTest.cpp b/cpp/tests/EventChannelThreadsTest.cpp
index 285ed29518..285ed29518 100644
--- a/cpp-0-9/tests/EventChannelThreadsTest.cpp
+++ b/cpp/tests/EventChannelThreadsTest.cpp
diff --git a/cpp-0-9/tests/ExceptionTest.cpp b/cpp/tests/ExceptionTest.cpp
index 6cea863168..6cea863168 100644
--- a/cpp-0-9/tests/ExceptionTest.cpp
+++ b/cpp/tests/ExceptionTest.cpp
diff --git a/cpp-0-9/tests/ExchangeTest.cpp b/cpp/tests/ExchangeTest.cpp
index cccec92024..cccec92024 100644
--- a/cpp-0-9/tests/ExchangeTest.cpp
+++ b/cpp/tests/ExchangeTest.cpp
diff --git a/cpp-0-9/tests/FieldTableTest.cpp b/cpp/tests/FieldTableTest.cpp
index 8d9285bf4b..8d9285bf4b 100644
--- a/cpp-0-9/tests/FieldTableTest.cpp
+++ b/cpp/tests/FieldTableTest.cpp
diff --git a/cpp-0-9/tests/FramingTest.cpp b/cpp/tests/FramingTest.cpp
index f8754337c8..f8754337c8 100644
--- a/cpp-0-9/tests/FramingTest.cpp
+++ b/cpp/tests/FramingTest.cpp
diff --git a/cpp-0-9/tests/HeaderTest.cpp b/cpp/tests/HeaderTest.cpp
index f77aaaedb4..f77aaaedb4 100644
--- a/cpp-0-9/tests/HeaderTest.cpp
+++ b/cpp/tests/HeaderTest.cpp
diff --git a/cpp-0-9/tests/HeadersExchangeTest.cpp b/cpp/tests/HeadersExchangeTest.cpp
index 6cd51c55a9..6cd51c55a9 100644
--- a/cpp-0-9/tests/HeadersExchangeTest.cpp
+++ b/cpp/tests/HeadersExchangeTest.cpp
diff --git a/cpp-0-9/tests/InMemoryContentTest.cpp b/cpp/tests/InMemoryContentTest.cpp
index d02cc56a7b..d02cc56a7b 100644
--- a/cpp-0-9/tests/InMemoryContentTest.cpp
+++ b/cpp/tests/InMemoryContentTest.cpp
diff --git a/cpp-0-9/tests/InProcessBroker.h b/cpp/tests/InProcessBroker.h
index 709ca9b953..709ca9b953 100644
--- a/cpp-0-9/tests/InProcessBroker.h
+++ b/cpp/tests/InProcessBroker.h
diff --git a/cpp-0-9/tests/LazyLoadedContentTest.cpp b/cpp/tests/LazyLoadedContentTest.cpp
index b24cd5a84a..b24cd5a84a 100644
--- a/cpp-0-9/tests/LazyLoadedContentTest.cpp
+++ b/cpp/tests/LazyLoadedContentTest.cpp
diff --git a/cpp-0-9/tests/Makefile.am b/cpp/tests/Makefile.am
index edad0945f3..edad0945f3 100644
--- a/cpp-0-9/tests/Makefile.am
+++ b/cpp/tests/Makefile.am
diff --git a/cpp-0-9/tests/MessageBuilderTest.cpp b/cpp/tests/MessageBuilderTest.cpp
index d3b3902e97..d3b3902e97 100644
--- a/cpp-0-9/tests/MessageBuilderTest.cpp
+++ b/cpp/tests/MessageBuilderTest.cpp
diff --git a/cpp-0-9/tests/MessageHandlerTest.cpp b/cpp/tests/MessageHandlerTest.cpp
index 55971355f6..55971355f6 100644
--- a/cpp-0-9/tests/MessageHandlerTest.cpp
+++ b/cpp/tests/MessageHandlerTest.cpp
diff --git a/cpp-0-9/tests/MessageTest.cpp b/cpp/tests/MessageTest.cpp
index a3bbfe4afc..a3bbfe4afc 100644
--- a/cpp-0-9/tests/MessageTest.cpp
+++ b/cpp/tests/MessageTest.cpp
diff --git a/cpp-0-9/tests/MockChannel.h b/cpp/tests/MockChannel.h
index 10fcb56969..10fcb56969 100644
--- a/cpp-0-9/tests/MockChannel.h
+++ b/cpp/tests/MockChannel.h
diff --git a/cpp-0-9/tests/MockConnectionInputHandler.h b/cpp/tests/MockConnectionInputHandler.h
index b039e244d9..b039e244d9 100644
--- a/cpp-0-9/tests/MockConnectionInputHandler.h
+++ b/cpp/tests/MockConnectionInputHandler.h
diff --git a/cpp-0-9/tests/ProducerConsumerTest.cpp b/cpp/tests/ProducerConsumerTest.cpp
index e6d4090596..e6d4090596 100644
--- a/cpp-0-9/tests/ProducerConsumerTest.cpp
+++ b/cpp/tests/ProducerConsumerTest.cpp
diff --git a/cpp-0-9/tests/QueuePolicyTest.cpp b/cpp/tests/QueuePolicyTest.cpp
index 20917dcd6a..20917dcd6a 100644
--- a/cpp-0-9/tests/QueuePolicyTest.cpp
+++ b/cpp/tests/QueuePolicyTest.cpp
diff --git a/cpp-0-9/tests/QueueRegistryTest.cpp b/cpp/tests/QueueRegistryTest.cpp
index 3926d56292..3926d56292 100644
--- a/cpp-0-9/tests/QueueRegistryTest.cpp
+++ b/cpp/tests/QueueRegistryTest.cpp
diff --git a/cpp-0-9/tests/QueueTest.cpp b/cpp/tests/QueueTest.cpp
index fa38029de1..fa38029de1 100644
--- a/cpp-0-9/tests/QueueTest.cpp
+++ b/cpp/tests/QueueTest.cpp
diff --git a/cpp-0-9/tests/ReferenceTest.cpp b/cpp/tests/ReferenceTest.cpp
index 753f68ee75..753f68ee75 100644
--- a/cpp-0-9/tests/ReferenceTest.cpp
+++ b/cpp/tests/ReferenceTest.cpp
diff --git a/cpp-0-9/tests/TopicExchangeTest.cpp b/cpp/tests/TopicExchangeTest.cpp
index 4ba9cdd6e5..4ba9cdd6e5 100644
--- a/cpp-0-9/tests/TopicExchangeTest.cpp
+++ b/cpp/tests/TopicExchangeTest.cpp
diff --git a/cpp-0-9/tests/TxAckTest.cpp b/cpp/tests/TxAckTest.cpp
index c189533ea9..c189533ea9 100644
--- a/cpp-0-9/tests/TxAckTest.cpp
+++ b/cpp/tests/TxAckTest.cpp
diff --git a/cpp-0-9/tests/TxBufferTest.cpp b/cpp/tests/TxBufferTest.cpp
index 8a9b233eb9..8a9b233eb9 100644
--- a/cpp-0-9/tests/TxBufferTest.cpp
+++ b/cpp/tests/TxBufferTest.cpp
diff --git a/cpp-0-9/tests/TxPublishTest.cpp b/cpp/tests/TxPublishTest.cpp
index d9d5607c06..d9d5607c06 100644
--- a/cpp-0-9/tests/TxPublishTest.cpp
+++ b/cpp/tests/TxPublishTest.cpp
diff --git a/cpp-0-9/tests/ValueTest.cpp b/cpp/tests/ValueTest.cpp
index a3f9ec2541..a3f9ec2541 100644
--- a/cpp-0-9/tests/ValueTest.cpp
+++ b/cpp/tests/ValueTest.cpp
diff --git a/cpp-0-9/tests/client_test.cpp b/cpp/tests/client_test.cpp
index 413523a6a7..413523a6a7 100644
--- a/cpp-0-9/tests/client_test.cpp
+++ b/cpp/tests/client_test.cpp
diff --git a/cpp-0-9/tests/echo_service.cpp b/cpp/tests/echo_service.cpp
index 412ffbeb58..412ffbeb58 100644
--- a/cpp-0-9/tests/echo_service.cpp
+++ b/cpp/tests/echo_service.cpp
diff --git a/cpp-0-9/tests/examples.Makefile b/cpp/tests/examples.Makefile
index 45999f7852..45999f7852 100644
--- a/cpp-0-9/tests/examples.Makefile
+++ b/cpp/tests/examples.Makefile
diff --git a/cpp-0-9/tests/examples.README b/cpp/tests/examples.README
index 65f908c249..65f908c249 100644
--- a/cpp-0-9/tests/examples.README
+++ b/cpp/tests/examples.README
diff --git a/cpp-0-9/tests/kill_broker b/cpp/tests/kill_broker
index b71ca22ffd..b71ca22ffd 100755
--- a/cpp-0-9/tests/kill_broker
+++ b/cpp/tests/kill_broker
diff --git a/cpp-0-9/tests/python_tests b/cpp/tests/python_tests
index 4ee177ce6a..4ee177ce6a 100755
--- a/cpp-0-9/tests/python_tests
+++ b/cpp/tests/python_tests
diff --git a/cpp-0-9/tests/qpid_test_plugin.h b/cpp/tests/qpid_test_plugin.h
index b2f4a8ffed..b2f4a8ffed 100644
--- a/cpp-0-9/tests/qpid_test_plugin.h
+++ b/cpp/tests/qpid_test_plugin.h
diff --git a/cpp-0-9/tests/quick_topictest b/cpp/tests/quick_topictest
index 9df5b5c84c..9df5b5c84c 100755
--- a/cpp-0-9/tests/quick_topictest
+++ b/cpp/tests/quick_topictest
diff --git a/cpp-0-9/tests/run-python-tests b/cpp/tests/run-python-tests
index e69de29bb2..e69de29bb2 100755
--- a/cpp-0-9/tests/run-python-tests
+++ b/cpp/tests/run-python-tests
diff --git a/cpp-0-9/tests/run-unit-tests b/cpp/tests/run-unit-tests
index 0ab01f05c5..0ab01f05c5 100755
--- a/cpp-0-9/tests/run-unit-tests
+++ b/cpp/tests/run-unit-tests
diff --git a/cpp-0-9/tests/setup b/cpp/tests/setup
index 9dde4758b1..9dde4758b1 100644
--- a/cpp-0-9/tests/setup
+++ b/cpp/tests/setup
diff --git a/cpp-0-9/tests/start_broker b/cpp/tests/start_broker
index fe30458463..fe30458463 100755
--- a/cpp-0-9/tests/start_broker
+++ b/cpp/tests/start_broker
diff --git a/cpp-0-9/tests/topic_listener.cpp b/cpp/tests/topic_listener.cpp
index 5f5500f7b9..5f5500f7b9 100644
--- a/cpp-0-9/tests/topic_listener.cpp
+++ b/cpp/tests/topic_listener.cpp
diff --git a/cpp-0-9/tests/topic_publisher.cpp b/cpp/tests/topic_publisher.cpp
index 0e6c63ab35..0e6c63ab35 100644
--- a/cpp-0-9/tests/topic_publisher.cpp
+++ b/cpp/tests/topic_publisher.cpp
diff --git a/cpp-0-9/tests/topictest b/cpp/tests/topictest
index 76807b82bd..76807b82bd 100755
--- a/cpp-0-9/tests/topictest
+++ b/cpp/tests/topictest
diff --git a/cpp-0-9/versions b/cpp/versions
index 2c82e3fd80..2c82e3fd80 100755
--- a/cpp-0-9/versions
+++ b/cpp/versions