summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2008-06-20 22:48:36 +0000
committerAndrew Stitcher <astitcher@apache.org>2008-06-20 22:48:36 +0000
commit476fa9e1bd2bde055b6fb436ca093d60e559cb47 (patch)
tree512064c757a1d790ef8959715a007fc629810807 /cpp/src
parent11ccae93c7550828f7083a74f90a691769271b66 (diff)
downloadqpid-python-476fa9e1bd2bde055b6fb436ca093d60e559cb47.tar.gz
QPID-1069: Patch from Steve Huston: Build with Boost 1.35
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@670089 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/framing/Blob.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/qpid/framing/Blob.h b/cpp/src/qpid/framing/Blob.h
index 8b304ba708..7cf4cefc3b 100644
--- a/cpp/src/qpid/framing/Blob.h
+++ b/cpp/src/qpid/framing/Blob.h
@@ -27,6 +27,7 @@
#include <boost/utility/typed_in_place_factory.hpp>
#include <boost/type_traits/is_base_and_derived.hpp>
#include <boost/utility/enable_if.hpp>
+#include <boost/version.hpp>
#include <new>
@@ -39,7 +40,8 @@ namespace framing {
using boost::in_place;
using boost::typed_in_place_factory_base;
-/** 0-arg typed_in_place_factory, missing in boost. */
+/** 0-arg typed_in_place_factory, missing in pre-1.35 boost. */
+#if (BOOST_VERSION < 103500)
template <class T>
struct typed_in_place_factory0 : public typed_in_place_factory_base {
typedef T value_type ;
@@ -49,6 +51,7 @@ struct typed_in_place_factory0 : public typed_in_place_factory_base {
/** 0-arg in_place<T>() function, missing from boost. */
template<class T>
typed_in_place_factory0<T> in_place() { return typed_in_place_factory0<T>(); }
+#endif
template <class T, class R=void>
struct EnableInPlace