3 files changed, 7 insertions, 6 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 3031951ed3..e06468dddc 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -177,7 +177,8 @@ if (NOT DEFINED Boost_ADDITIONAL_VERSIONS)
   set (Boost_ADDITIONAL_VERSIONS
         "1.45" "1.45.0" "1.46" "1.46.0" "1.47" "1.47.0"
         "1.48" "1.48.0" "1.49" "1.49.0" "1.50" "1.50.0"
-        "1.51" "1.51.0" "1.52" "1.52.0" "1.53" "1.53.0")
+        "1.51" "1.51.0" "1.52" "1.52.0" "1.53" "1.53.0"
+        "1.54" "1.54.0" "1.55" "1.55.0")
 endif (NOT DEFINED Boost_ADDITIONAL_VERSIONS)
 
 # Discover Boost version
diff --git a/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
index 02eb00b7f4..73f1c80f48 100644
--- a/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
@@ -168,10 +168,10 @@ void ExchangeRegistry::checkType(const std::string& type)
 
 namespace
 {
-const std::string empty;
+const std::string EMPTY;
 }
 
 Exchange::shared_ptr ExchangeRegistry::getDefault()
 {
-    return get(empty);
+    return get(EMPTY);
 }
diff --git a/qpid/cpp/src/qpid/broker/MessageAdapter.cpp b/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
index 0eb4a6fa22..489386f82e 100644
--- a/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
@@ -26,7 +26,7 @@
 #include "qpid/framing/MessageTransferBody.h"
 
 namespace {
-    const std::string empty;
+    const std::string EMPTY;
 }
 
 namespace qpid {
@@ -35,7 +35,7 @@ namespace broker{
     std::string TransferAdapter::getRoutingKey(const framing::FrameSet& f)
     {
         const framing::DeliveryProperties* p = f.getHeaders()->get<framing::DeliveryProperties>();
-        return p ? p->getRoutingKey() : empty;
+        return p ? p->getRoutingKey() : EMPTY;
     }
 
     std::string TransferAdapter::getExchange(const framing::FrameSet& f)
@@ -76,6 +76,6 @@ namespace broker{
     std::string TransferAdapter::getAppId(const framing::FrameSet& f)
     {
         const framing::MessageProperties* p = f.getHeaders()->get<framing::MessageProperties>();
-        return p ? p->getAppId() : empty;
+        return p ? p->getAppId() : EMPTY;
     }
 }}