diff options
| author | Alan Conway <aconway@apache.org> | 2008-10-16 14:41:16 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-10-16 14:41:16 +0000 |
| commit | 85744feba6da900300123d95c8b9288d99d2d572 (patch) | |
| tree | a18c19ada10695bb69b1f14add957f9cc89fb276 /qpid/cpp/src | |
| parent | bbd1d75ff6907ef3b74f7f6da6b995e8a877c9af (diff) | |
| download | qpid-python-85744feba6da900300123d95c8b9288d99d2d572.tar.gz | |
Compile boost.spirit library in thread-safe mode.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@705257 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/Url.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index c63b98b18d..888883c6ba 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -216,6 +216,7 @@ EXTRA_DIST +=\ libqpidcommon_la_LIBADD = \ -lboost_program_options \ -lboost_filesystem \ + -lboost_thread-mt \ -luuid \ $(LIB_DLOPEN) \ $(LIB_CLOCK_GETTIME) diff --git a/qpid/cpp/src/qpid/Url.cpp b/qpid/cpp/src/qpid/Url.cpp index 422939fdf4..22e81b3adc 100644 --- a/qpid/cpp/src/qpid/Url.cpp +++ b/qpid/cpp/src/qpid/Url.cpp @@ -23,6 +23,8 @@ #include "qpid/sys/StrError.h" #include <limits.h> // NB: must be before boost/spirit headers. +#define BOOST_SPIRIT_THREADSAFE + #include <boost/spirit.hpp> #include <boost/spirit/actor.hpp> @@ -43,7 +45,7 @@ std::ostream& operator<<(std::ostream& os, const TcpAddress& a) { std::istream& operator>>(std::istream&, const TcpAddress&); Url Url::getHostNameUrl(uint16_t port) { - TcpAddress address("", port); + TcpAddress address(std::string(), port); if (!sys::SystemInfo::getLocalHostname(address)) throw InvalidUrl(QPID_MSG("Cannot get host name: " << qpid::sys::strError(errno))); return Url(address); |