Author: chug
Date: Wed Oct 22 17:54:40 2014
New Revision: 1633665
URL: http://svn.apache.org/r1633665
Log:
QPID-6178: [C++ Broker] Fix compile issue with VS2008 and Boost 1.55
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1633665&r1=1633664&r2=1633665&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Wed Oct 22 17:54:40 2014
@@ -177,7 +177,8 @@ if (NOT DEFINED Boost_ADDITIONAL_VERSION
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
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp?rev=1633665&r1=1633664&r2=1633665&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp Wed Oct 22
17:54:40 2014
@@ -168,10 +168,10 @@ void ExchangeRegistry::checkType(const s
namespace
{
-const std::string empty;
+const std::string EMPTY;
}
Exchange::shared_ptr ExchangeRegistry::getDefault()
{
- return get(empty);
+ return get(EMPTY);
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp?rev=1633665&r1=1633664&r2=1633665&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp Wed Oct 22 17:54:40
2014
@@ -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;
}
}}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
