diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-08-24 00:03:52 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-08-24 00:03:52 -0400 |
| commit | 9fcf48482626f20151d75a2ebb81371b45d4540a (patch) | |
| tree | 48424a9a1f70fba360aba940669e031287b1a9c6 /src | |
| parent | ff07cc6c6fe38467b897d5b665c81fcfc49e3620 (diff) | |
| download | fork-ledger-9fcf48482626f20151d75a2ebb81371b45d4540a.tar.gz fork-ledger-9fcf48482626f20151d75a2ebb81371b45d4540a.tar.bz2 fork-ledger-9fcf48482626f20151d75a2ebb81371b45d4540a.zip | |
Moved up to Boost 1.44
Diffstat (limited to 'src')
| -rw-r--r-- | src/stream.cc | 4 | ||||
| -rw-r--r-- | src/system.hh.in | 6 |
2 files changed, 9 insertions, 1 deletions
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) |