From aa755f3335869aca7b391b0db6b38316ae036749 Mon Sep 17 00:00:00 2001 From: "Charles E. Rolke" Date: Wed, 22 Oct 2014 17:54:40 +0000 Subject: QPID-6178: [C++ Broker] Fix compile issue with VS2008 and Boost 1.55 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633665 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/CMakeLists.txt | 3 ++- qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp | 4 ++-- qpid/cpp/src/qpid/broker/MessageAdapter.cpp | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'qpid/cpp') 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(); - 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(); - return p ? p->getAppId() : empty; + return p ? p->getAppId() : EMPTY; } }} -- cgit v1.2.1