From 9fcf48482626f20151d75a2ebb81371b45d4540a Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 24 Aug 2010 00:03:52 -0400
Subject: Moved up to Boost 1.44

---
 acprep             |  2 +-
 lib/Makefile       |  2 +-
 src/stream.cc      |  4 ++++
 src/system.hh.in   |  6 +++++-
 tools/configure.ac | 10 ++++++++--
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/acprep b/acprep
index b6aa7cf9..114857c7 100755
--- a/acprep
+++ b/acprep
@@ -237,7 +237,7 @@ class CommandLineApp(object):
     force_exit    = True           # If true, always ends run() with sys.exit()
     log_handler   = None
     darwin_gcc    = False
-    boost_version = "1_43"
+    boost_version = "1_44"
 
     options = {
         'debug':    False,
diff --git a/lib/Makefile b/lib/Makefile
index e52764bc..a267e642 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -13,7 +13,7 @@ CPPFLAGS	= -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_FULLY_DYNAMIC_STRING=1
 CFLAGS		= $(CPPFLAGS) -g
 LDFLAGS		= -g
 
-BOOST_VERSION	= 1_43_0
+BOOST_VERSION	= 1_44_0
 BOOST_SOURCE	= boost_$(BOOST_VERSION)
 BOOST_TOOLSET	= darwin
 BOOST_DEFINES	= define=_GLIBCXX_DEBUG=1 define=_GLIBCXX_FULLY_DYNAMIC_STRING=1
diff --git a/src/stream.cc b/src/stream.cc
index 001e7760..5d4cf5e0 100644
--- a/src/stream.cc
+++ b/src/stream.cc
@@ -102,7 +102,11 @@ namespace {
     else {                      // parent
       close(pfd[0]);
       typedef iostreams::stream<iostreams::file_descriptor_sink> fdstream;
+#if BOOST_VERSION >= 104400
+      *os = new fdstream(pfd[1], iostreams::never_close_handle);
+#else // BOOST_VERSION >= 104400
       *os = new fdstream(pfd[1]);
+#endif // BOOST_VERSION >= 104400
     }
     return pfd[1];
 #else
diff --git a/src/system.hh.in b/src/system.hh.in
index d9e664e3..6f709684 100644
--- a/src/system.hh.in
+++ b/src/system.hh.in
@@ -160,7 +160,6 @@ typedef std::ostream::pos_type ostream_pos_type;
 #include <boost/operators.hpp>
 #include <boost/optional.hpp>
 #include <boost/ptr_container/ptr_list.hpp>
-#include <boost/ptr_container/serialize_ptr_deque.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_int.hpp>
 #include <boost/random/uniform_real.hpp>
@@ -194,6 +193,7 @@ typedef std::ostream::pos_type ostream_pos_type;
 
 #include <boost/date_time/posix_time/time_serialize.hpp>
 #include <boost/date_time/gregorian/greg_serialize.hpp>
+#include <boost/ptr_container/serialize_ptr_deque.hpp>
 
 namespace boost {
 namespace serialization {
@@ -239,6 +239,10 @@ void serialize(Archive& ar, istream_pos_type& pos, const unsigned int)
 } // namespace serialization
 } // namespace boost
 
+#else // HAVE_BOOST_SERIALIZATION
+
+#include <boost/ptr_container/ptr_deque.hpp>
+
 #endif // HAVE_BOOST_SERIALIZATION
 
 #if defined(HAVE_BOOST_PYTHON)
diff --git a/tools/configure.ac b/tools/configure.ac
index 69874101..92a30431 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -309,10 +309,16 @@ AC_CACHE_CHECK(
    AC_LINK_IFELSE(
      [AC_LANG_PROGRAM(
         [[#include <boost/iostreams/device/file_descriptor.hpp> 
-          #include <boost/iostreams/stream.hpp>]],
+          #include <boost/iostreams/stream.hpp>
+          #include <boost/version.hpp>]],
         [[namespace io = boost::iostreams; 
           typedef io::stream<io::file_descriptor_sink> ofdstream; 
-          ofdstream outstream(1);]])],
+#if BOOST_VERSION >= 104400
+          ofdstream outstream(1, io::never_close_handle);
+#else // BOOST_VERSION >= 104400
+          ofdstream outstream(1);
+#endif // BOOST_VERSION >= 104400
+        ]])],
      [boost_iostreams_cpplib_avail_cv_=true],
      [boost_iostreams_cpplib_avail_cv_=false])
    AC_LANG_POP
-- 
cgit v1.2.3