[QPID-1069] Patch to build trunk with Boost 1.35

• Type: Bug
• Status: Closed
• Priority: Trivial
• Resolution: Fixed
• Affects Version/s: M3
• Fix Version/s: 0.6
• Component/s: C++ Broker, C++ Client

Environment

RHEL, Boost 1.35

• Assignee: Andrew Stitcher
• Reporter: Stephen D. Huston
• Created: 18/May/08 00:29
• Updated: 29/Jul/13 18:54
• Resolved: 20/Jun/08 22:52

Description

Trunk C++ code fails to build with Boost 1.35 - there's a missing Boost feature prior to 1.35 that is now available. This patch allows C++ trunk code to build with Boost 1.35.
Index: Blob.h
===================================================================
— Blob.h (revision 657445)
+++ Blob.h (working copy)
@@ -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 @@
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 @@
/** 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