|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66037 - in branches/release: . boost boost/algorithm/string boost/archive boost/asio boost/asio/detail boost/asio/detail/impl boost/asio/impl boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/gil boost/graph boost/integer boost/interprocess boost/intrusive boost/io boost/iostreams boost/math boost/msm boost/numeric/ublas boost/program_options boost/property_tree boost/python boost/range boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/thread boost/tr1 boost/type_traits boost/unordered boost/utility boost/uuid boost/variant boost/wave doc libs libs/algorithm/string libs/array/doc libs/array/test libs/asio/test libs/asio/test/ssl libs/bimap libs/config libs/filesystem libs/functional/hash libs/fusion libs/graph_parallel libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/math/doc/sf_and_dist libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/python libs/range libs/regex libs/serialization libs/serialization/doc libs/serialization/test libs/signals libs/signals2 libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/thread libs/timer libs/tr1 libs/type_traits libs/type_traits/doc libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave more more/getting_started status tools tools/bcp tools/boostbook tools/build/v2 tools/inspect tools/quickbook tools/regression tools/regression/src tools/release tools/wave
From: chris_at_[hidden]
Date: 2010-10-17 08:24:56
Author: chris_kohlhoff
Date: 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
New Revision: 66037
URL: http://svn.boost.org/trac/boost/changeset/66037
Log:
Merge from trunk.
........
r65998 | chris_kohlhoff | 2010-10-16 15:30:12 +1100 (Sat, 16 Oct 2010) | 2 lines
Make unit tests build faster.
........
r66002 | chris_kohlhoff | 2010-10-16 16:13:46 +1100 (Sat, 16 Oct 2010) | 2 lines
Add a test case for bug where a deadline timer never fires if the io_service is run in a background thread. N.B. fails only on platforms that use kqueue. Fixes #4568.
........
r66004 | chris_kohlhoff | 2010-10-16 16:43:03 +1100 (Sat, 16 Oct 2010) | 2 lines
Fix the way the kqueue_reactor is interrupted when a new timer is scheduled. Fixes #4568.
........
r66005 | chris_kohlhoff | 2010-10-16 17:27:45 +1100 (Sat, 16 Oct 2010) | 2 lines
Fix a const-correctness issue that prevents valid uses of has_service<> from compiling. Fixes #4638.
........
r66006 | chris_kohlhoff | 2010-10-16 18:06:18 +1100 (Sat, 16 Oct 2010) | 2 lines
Use lower-case to keep MinGW cross-compilers happy. Fixes #4491.
........
r66007 | chris_kohlhoff | 2010-10-16 18:24:47 +1100 (Sat, 16 Oct 2010) | 2 lines
Don't use deprecated system functions. Fixes #4672.
........
r66008 | chris_kohlhoff | 2010-10-16 20:47:11 +1100 (Sat, 16 Oct 2010) | 2 lines
Ensure close()/closesocket() failures are correctly propagated. Fixes #4573.
........
r66009 | chris_kohlhoff | 2010-10-16 21:01:14 +1100 (Sat, 16 Oct 2010) | 2 lines
Check return code of InitializeCriticalSectionAndSpinCount. Fixes #4574.
........
r66010 | chris_kohlhoff | 2010-10-16 22:04:08 +1100 (Sat, 16 Oct 2010) | 2 lines
Add support for hardware flow control on QNX. Fixes #4625.
........
r66014 | chris_kohlhoff | 2010-10-16 22:39:13 +1100 (Sat, 16 Oct 2010) | 2 lines
Always use pselect() on HP-UX, if it is available. Fixes #4578.
........
r66017 | chris_kohlhoff | 2010-10-16 23:23:56 +1100 (Sat, 16 Oct 2010) | 2 lines
Ensure handler arguments are passed as lvalues. Fixes #4744.
........
r66018 | chris_kohlhoff | 2010-10-16 23:39:06 +1100 (Sat, 16 Oct 2010) | 2 lines
Fix Windows build when thread support is disabled. Fixes #4680.
........
r66020 | chris_kohlhoff | 2010-10-16 23:59:29 +1100 (Sat, 16 Oct 2010) | 3 lines
Timers with expiry times set more than 5 minutes in the future need the
waitable timer to be periodic. Fixes #4745.
........
r66035 | chris_kohlhoff | 2010-10-17 22:33:28 +1100 (Sun, 17 Oct 2010) | 2 lines
Version bump.
........
Properties modified:
branches/release/ (props changed)
branches/release/INSTALL (props changed)
branches/release/Jamroot (props changed)
branches/release/LICENSE_1_0.txt (props changed)
branches/release/boost/ (props changed)
branches/release/boost-build.jam (props changed)
branches/release/boost.css (props changed)
branches/release/boost.png (props changed)
branches/release/boost/algorithm/string/ (props changed)
branches/release/boost/archive/ (props changed)
branches/release/boost/archive/basic_archive.hpp (props changed)
branches/release/boost/array.hpp (props changed)
branches/release/boost/bimap/ (props changed)
branches/release/boost/config/ (props changed)
branches/release/boost/config.hpp (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/endian.hpp (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/filesystem.hpp (props changed)
branches/release/boost/functional/hash/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (props changed)
branches/release/boost/io/ (props changed)
branches/release/boost/iostreams/ (props changed)
branches/release/boost/math/ (props changed)
branches/release/boost/math_fwd.hpp (props changed)
branches/release/boost/msm/ (props changed)
branches/release/boost/numeric/ublas/ (props changed)
branches/release/boost/numeric/ublas/functional.hpp (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/property_tree/ (props changed)
branches/release/boost/python/ (props changed)
branches/release/boost/range/ (props changed)
branches/release/boost/regex/ (props changed)
branches/release/boost/serialization/ (props changed)
branches/release/boost/signals/ (props changed)
branches/release/boost/signals2/ (props changed)
branches/release/boost/signals2.hpp (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
branches/release/boost/spirit/home/karma/ (props changed)
branches/release/boost/spirit/home/support/attributes.hpp (props changed)
branches/release/boost/statechart/ (props changed)
branches/release/boost/system/ (props changed)
branches/release/boost/thread/ (props changed)
branches/release/boost/thread.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (props changed)
branches/release/boost/unordered/ (props changed)
branches/release/boost/utility/ (props changed)
branches/release/boost/utility/value_init.hpp (props changed)
branches/release/boost/uuid/ (props changed)
branches/release/boost/variant/ (props changed)
branches/release/boost/version.hpp (props changed)
branches/release/boost/wave/ (props changed)
branches/release/bootstrap.bat (props changed)
branches/release/bootstrap.sh (props changed)
branches/release/doc/ (props changed)
branches/release/index.htm (props changed)
branches/release/index.html (props changed)
branches/release/libs/ (props changed)
branches/release/libs/algorithm/string/ (props changed)
branches/release/libs/array/doc/array.xml (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/array/test/array2.cpp (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/functional/hash/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/graph_parallel/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/maintainers.txt (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/math/doc/sf_and_dist/ (props changed)
branches/release/libs/mpi/build/ (props changed)
branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
branches/release/libs/msm/ (props changed)
branches/release/libs/numeric/ublas/ (props changed)
branches/release/libs/numeric/ublas/doc/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/serialization/doc/ (props changed)
branches/release/libs/serialization/test/ (props changed)
branches/release/libs/serialization/test/A.cpp (props changed)
branches/release/libs/serialization/test/A.hpp (props changed)
branches/release/libs/serialization/test/A.ipp (props changed)
branches/release/libs/serialization/test/B.hpp (props changed)
branches/release/libs/serialization/test/C.hpp (props changed)
branches/release/libs/serialization/test/D.hpp (props changed)
branches/release/libs/serialization/test/J.hpp (props changed)
branches/release/libs/serialization/test/Jamfile.v2 (props changed)
branches/release/libs/serialization/test/base.hpp (props changed)
branches/release/libs/serialization/test/binary_archive.hpp (props changed)
branches/release/libs/serialization/test/binary_warchive.hpp (props changed)
branches/release/libs/serialization/test/derived2.hpp (props changed)
branches/release/libs/serialization/test/dll_a.cpp (props changed)
branches/release/libs/serialization/test/dll_base.cpp (props changed)
branches/release/libs/serialization/test/dll_derived2.cpp (props changed)
branches/release/libs/serialization/test/polymorphic_array_binary_archive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_base.cpp (props changed)
branches/release/libs/serialization/test/polymorphic_base.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_binary_archive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_derived1.cpp (props changed)
branches/release/libs/serialization/test/polymorphic_derived1.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_derived2.cpp (props changed)
branches/release/libs/serialization/test/polymorphic_derived2.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_text_archive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_text_warchive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_xml_archive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_xml_warchive.hpp (props changed)
branches/release/libs/serialization/test/portable_binary_archive.hpp (props changed)
branches/release/libs/serialization/test/test_array.cpp (props changed)
branches/release/libs/serialization/test/test_binary.cpp (props changed)
branches/release/libs/serialization/test/test_bitset.cpp (props changed)
branches/release/libs/serialization/test/test_check.cpp (props changed)
branches/release/libs/serialization/test/test_class_info_load.cpp (props changed)
branches/release/libs/serialization/test/test_class_info_save.cpp (props changed)
branches/release/libs/serialization/test/test_codecvt_null.cpp (props changed)
branches/release/libs/serialization/test/test_complex.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail1.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail1_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail2.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail2_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail3.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail3_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_pass.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn1.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn1_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn2.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn2_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn3.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn3_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn4.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn4_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_contained_class.cpp (props changed)
branches/release/libs/serialization/test/test_cyclic_ptrs.cpp (props changed)
branches/release/libs/serialization/test/test_decl.hpp (props changed)
branches/release/libs/serialization/test/test_delete_pointer.cpp (props changed)
branches/release/libs/serialization/test/test_deque.cpp (props changed)
branches/release/libs/serialization/test/test_derived.cpp (props changed)
branches/release/libs/serialization/test/test_derived_class.cpp (props changed)
branches/release/libs/serialization/test/test_derived_class_ptr.cpp (props changed)
branches/release/libs/serialization/test/test_diamond.cpp (props changed)
branches/release/libs/serialization/test/test_diamond_complex.cpp (props changed)
branches/release/libs/serialization/test/test_dll_exported.cpp (props changed)
branches/release/libs/serialization/test/test_dll_plugin.cpp (props changed)
branches/release/libs/serialization/test/test_dll_simple.cpp (props changed)
branches/release/libs/serialization/test/test_exported.cpp (props changed)
branches/release/libs/serialization/test/test_inclusion.cpp (props changed)
branches/release/libs/serialization/test/test_iterators.cpp (props changed)
branches/release/libs/serialization/test/test_iterators_base64.cpp (props changed)
branches/release/libs/serialization/test/test_list.cpp (props changed)
branches/release/libs/serialization/test/test_list_ptrs.cpp (props changed)
branches/release/libs/serialization/test/test_map.cpp (props changed)
branches/release/libs/serialization/test/test_mi.cpp (props changed)
branches/release/libs/serialization/test/test_mult_archive_types.cpp (props changed)
branches/release/libs/serialization/test/test_multiple_inheritance.cpp (props changed)
branches/release/libs/serialization/test/test_multiple_ptrs.cpp (props changed)
branches/release/libs/serialization/test/test_new_operator.cpp (props changed)
branches/release/libs/serialization/test/test_no_rtti.cpp (props changed)
branches/release/libs/serialization/test/test_non_default_ctor.cpp (props changed)
branches/release/libs/serialization/test/test_non_default_ctor2.cpp (props changed)
branches/release/libs/serialization/test/test_non_intrusive.cpp (props changed)
branches/release/libs/serialization/test/test_not_serializable.cpp (props changed)
branches/release/libs/serialization/test/test_null_ptr.cpp (props changed)
branches/release/libs/serialization/test/test_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_object.cpp (props changed)
branches/release/libs/serialization/test/test_optional.cpp (props changed)
branches/release/libs/serialization/test/test_pimpl.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic2.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic2.hpp (props changed)
branches/release/libs/serialization/test/test_polymorphic2imp.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic_A.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic_A.hpp (props changed)
branches/release/libs/serialization/test/test_primitive.cpp (props changed)
branches/release/libs/serialization/test/test_private_base.cpp (props changed)
branches/release/libs/serialization/test/test_private_ctor.cpp (props changed)
branches/release/libs/serialization/test/test_recursion.cpp (props changed)
branches/release/libs/serialization/test/test_registered.cpp (props changed)
branches/release/libs/serialization/test/test_reset_object_address.cpp (props changed)
branches/release/libs/serialization/test/test_set.cpp (props changed)
branches/release/libs/serialization/test/test_shared_ptr.cpp (props changed)
branches/release/libs/serialization/test/test_shared_ptr_132.cpp (props changed)
branches/release/libs/serialization/test/test_shared_ptr_multi_base.cpp (props changed)
branches/release/libs/serialization/test/test_simple_class.cpp (props changed)
branches/release/libs/serialization/test/test_simple_class_ptr.cpp (props changed)
branches/release/libs/serialization/test/test_singleton.cpp (props changed)
branches/release/libs/serialization/test/test_smart_cast.cpp (props changed)
branches/release/libs/serialization/test/test_split.cpp (props changed)
branches/release/libs/serialization/test/test_static_warning.cpp (props changed)
branches/release/libs/serialization/test/test_tools.hpp (props changed)
branches/release/libs/serialization/test/test_tracking.cpp (props changed)
branches/release/libs/serialization/test/test_traits_fail.cpp (props changed)
branches/release/libs/serialization/test/test_traits_pass.cpp (props changed)
branches/release/libs/serialization/test/test_unregistered.cpp (props changed)
branches/release/libs/serialization/test/test_utf8_codecvt.cpp (props changed)
branches/release/libs/serialization/test/test_valarray.cpp (props changed)
branches/release/libs/serialization/test/test_variant.cpp (props changed)
branches/release/libs/serialization/test/test_vector.cpp (props changed)
branches/release/libs/serialization/test/test_void_cast.cpp (props changed)
branches/release/libs/serialization/test/text_archive.hpp (props changed)
branches/release/libs/serialization/test/text_warchive.hpp (props changed)
branches/release/libs/serialization/test/xml_archive.hpp (props changed)
branches/release/libs/serialization/test/xml_warchive.hpp (props changed)
branches/release/libs/signals/ (props changed)
branches/release/libs/signals2/ (props changed)
branches/release/libs/spirit/ (props changed)
branches/release/libs/spirit/classic/example/ (props changed)
branches/release/libs/spirit/doc/ (props changed)
branches/release/libs/spirit/example/ (props changed)
branches/release/libs/spirit/phoenix/ (props changed)
branches/release/libs/spirit/test/ (props changed)
branches/release/libs/spirit/test/qi/optional.cpp (props changed)
branches/release/libs/statechart/ (props changed)
branches/release/libs/static_assert/ (props changed)
branches/release/libs/system/ (props changed)
branches/release/libs/thread/ (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/tr1/ (props changed)
branches/release/libs/type_traits/ (props changed)
branches/release/libs/type_traits/doc/ (props changed)
branches/release/libs/unordered/ (props changed)
branches/release/libs/utility/ (props changed)
branches/release/libs/utility/swap.html (props changed)
branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
branches/release/libs/utility/value_init.htm (props changed)
branches/release/libs/utility/value_init_test.cpp (props changed)
branches/release/libs/uuid/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/more/ (props changed)
branches/release/more/getting_started/ (props changed)
branches/release/rst.css (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/status/explicit-failures-markup.xml (props changed)
branches/release/tools/ (props changed)
branches/release/tools/bcp/ (props changed)
branches/release/tools/boostbook/ (props changed)
branches/release/tools/build/v2/ (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/regression/src/library_status.cpp (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/boost/asio/detail/config.hpp | 1
branches/release/boost/asio/detail/impl/kqueue_reactor.hpp | 2
branches/release/boost/asio/detail/impl/socket_ops.ipp | 10 ++--
branches/release/boost/asio/detail/impl/win_iocp_io_service.ipp | 6 +++
branches/release/boost/asio/detail/impl/win_mutex.ipp | 6 ++-
branches/release/boost/asio/detail/null_thread.hpp | 2
branches/release/boost/asio/detail/service_registry.hpp | 5 +-
branches/release/boost/asio/detail/socket_types.hpp | 5 +-
branches/release/boost/asio/error.hpp | 6 ++
branches/release/boost/asio/impl/read.hpp | 6 +-
branches/release/boost/asio/impl/read_at.hpp | 6 +-
branches/release/boost/asio/impl/read_until.hpp | 44 ++++++++++++++++++++----
branches/release/boost/asio/impl/serial_port_base.ipp | 13 +++++++
branches/release/boost/asio/impl/write.hpp | 6 +-
branches/release/boost/asio/impl/write_at.hpp | 6 +-
branches/release/boost/asio/version.hpp | 2
branches/release/libs/asio/test/Jamfile | 1
branches/release/libs/asio/test/Jamfile.v2 | 1
branches/release/libs/asio/test/deadline_timer.cpp | 27 +++++++++++++++
branches/release/libs/asio/test/io_service.cpp | 71 ++++++++++++++++++++++++++++++++++++++++
branches/release/libs/asio/test/ssl/Jamfile | 1
branches/release/libs/asio/test/ssl/Jamfile.v2 | 1
branches/release/libs/asio/test/unit_test.hpp | 1
23 files changed, 193 insertions(+), 36 deletions(-)
Modified: branches/release/boost/asio/detail/config.hpp
==============================================================================
--- branches/release/boost/asio/detail/config.hpp (original)
+++ branches/release/boost/asio/detail/config.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -12,6 +12,7 @@
#define BOOST_ASIO_DETAIL_CONFIG_HPP
#include <boost/config.hpp>
+#include <boost/version.hpp>
// Default to a header-only implementation. The user must specifically request
// separate compilation by defining either BOOST_ASIO_SEPARATE_COMPILATION or
Modified: branches/release/boost/asio/detail/impl/kqueue_reactor.hpp
==============================================================================
--- branches/release/boost/asio/detail/impl/kqueue_reactor.hpp (original)
+++ branches/release/boost/asio/detail/impl/kqueue_reactor.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -55,7 +55,7 @@
bool earliest = queue.enqueue_timer(time, timer, op);
io_service_.work_started();
if (earliest)
- interrupter_.interrupt();
+ interrupt();
}
template <typename Time_Traits>
Modified: branches/release/boost/asio/detail/impl/socket_ops.ipp
==============================================================================
--- branches/release/boost/asio/detail/impl/socket_ops.ipp (original)
+++ branches/release/boost/asio/detail/impl/socket_ops.ipp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -312,14 +312,14 @@
clear_last_error();
#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
- int result = error_wrapper(::closesocket(s), ec);
+ result = error_wrapper(::closesocket(s), ec);
#else // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
- int result = error_wrapper(::close(s), ec);
+ result = error_wrapper(::close(s), ec);
#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
- if (result == 0)
- ec = boost::system::error_code();
}
+ if (result == 0)
+ ec = boost::system::error_code();
return result;
}
@@ -1483,7 +1483,7 @@
timeout->tv_usec = 1000;
#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-#if defined(__hpux) && defined(__HP_aCC)
+#if defined(__hpux) && defined(__SELECT)
timespec ts;
ts.tv_sec = timeout ? timeout->tv_sec : 0;
ts.tv_nsec = timeout ? timeout->tv_usec * 1000 : 0;
Modified: branches/release/boost/asio/detail/impl/win_iocp_io_service.ipp
==============================================================================
--- branches/release/boost/asio/detail/impl/win_iocp_io_service.ipp (original)
+++ branches/release/boost/asio/detail/impl/win_iocp_io_service.ipp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -447,6 +447,12 @@
boost::asio::error::get_system_category());
boost::asio::detail::throw_error(ec, "timer");
}
+
+ LARGE_INTEGER timeout;
+ timeout.QuadPart = -max_timeout_usec;
+ timeout.QuadPart *= 10;
+ ::SetWaitableTimer(waitable_timer_.handle,
+ &timeout, max_timeout_msec, 0, 0, FALSE);
}
if (!timer_thread_)
Modified: branches/release/boost/asio/detail/impl/win_mutex.ipp
==============================================================================
--- branches/release/boost/asio/detail/impl/win_mutex.ipp (original)
+++ branches/release/boost/asio/detail/impl/win_mutex.ipp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -45,7 +45,8 @@
# if defined(UNDER_CE)
::InitializeCriticalSection(&crit_section_);
# else
- ::InitializeCriticalSectionAndSpinCount(&crit_section_, 0x80000000);
+ if (!::InitializeCriticalSectionAndSpinCount(&crit_section_, 0x80000000))
+ return ::GetLastError();
# endif
return 0;
#else
@@ -54,7 +55,8 @@
# if defined(UNDER_CE)
::InitializeCriticalSection(&crit_section_);
# else
- ::InitializeCriticalSectionAndSpinCount(&crit_section_, 0x80000000);
+ if (!::InitializeCriticalSectionAndSpinCount(&crit_section_, 0x80000000))
+ return ::GetLastError();
# endif
}
__except(GetExceptionCode() == STATUS_NO_MEMORY
Modified: branches/release/boost/asio/detail/null_thread.hpp
==============================================================================
--- branches/release/boost/asio/detail/null_thread.hpp (original)
+++ branches/release/boost/asio/detail/null_thread.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -35,7 +35,7 @@
public:
// Constructor.
template <typename Function>
- null_thread(Function)
+ null_thread(Function, unsigned int = 0)
{
boost::asio::detail::throw_error(
boost::asio::error::operation_not_supported, "thread");
Modified: branches/release/boost/asio/detail/service_registry.hpp
==============================================================================
--- branches/release/boost/asio/detail/service_registry.hpp (original)
+++ branches/release/boost/asio/detail/service_registry.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -75,13 +75,14 @@
private:
// Initialise a service's key based on its id.
- BOOST_ASIO_DECL void init_key(boost::asio::io_service::service::key& key,
+ BOOST_ASIO_DECL static void init_key(
+ boost::asio::io_service::service::key& key,
const boost::asio::io_service::id& id);
#if !defined(BOOST_ASIO_NO_TYPEID)
// Initialise a service's key based on its id.
template <typename Service>
- void init_key(boost::asio::io_service::service::key& key,
+ static void init_key(boost::asio::io_service::service::key& key,
const boost::asio::detail::service_id<Service>& /*id*/);
#endif // !defined(BOOST_ASIO_NO_TYPEID)
Modified: branches/release/boost/asio/detail/socket_types.hpp
==============================================================================
--- branches/release/boost/asio/detail/socket_types.hpp (original)
+++ branches/release/boost/asio/detail/socket_types.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -52,9 +52,10 @@
# include <sys/types.h>
# include <sys/stat.h>
# include <fcntl.h>
-# if defined(__hpux) && !defined(__HP_aCC)
+# if defined(__hpux)
# include <sys/time.h>
-# else
+# endif
+# if !defined(__hpux) || defined(__SELECT)
# include <sys/select.h>
# endif
# include <sys/socket.h>
Modified: branches/release/boost/asio/error.hpp
==============================================================================
--- branches/release/boost/asio/error.hpp (original)
+++ branches/release/boost/asio/error.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -19,7 +19,7 @@
#include <boost/cerrno.hpp>
#include <boost/system/error_code.hpp>
#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-# include <WinError.h>
+# include <winerror.h>
#else
# include <cerrno>
# include <netdb.h>
@@ -217,7 +217,11 @@
inline const boost::system::error_category& get_system_category()
{
+#if (BOOST_VERSION < 104400)
return boost::system::get_system_category();
+#else
+ return boost::system::system_category();
+#endif
}
#if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__)
Modified: branches/release/boost/asio/impl/read.hpp
==============================================================================
--- branches/release/boost/asio/impl/read.hpp (original)
+++ branches/release/boost/asio/impl/read.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -160,7 +160,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
@@ -212,7 +212,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
@@ -317,7 +317,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
Modified: branches/release/boost/asio/impl/read_at.hpp
==============================================================================
--- branches/release/boost/asio/impl/read_at.hpp (original)
+++ branches/release/boost/asio/impl/read_at.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -173,7 +173,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
@@ -226,7 +226,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
@@ -338,7 +338,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
Modified: branches/release/boost/asio/impl/read_until.hpp
==============================================================================
--- branches/release/boost/asio/impl/read_until.hpp (original)
+++ branches/release/boost/asio/impl/read_until.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -392,8 +392,15 @@
break;
}
- handler_(search_position_ == not_found ? error::not_found : ec,
- ec || search_position_ == not_found ? 0 : search_position_);
+ const boost::system::error_code result_ec =
+ (search_position_ == not_found)
+ ? error::not_found : ec;
+
+ const std::size_t result_n =
+ (ec || search_position_ == not_found)
+ ? 0 : search_position_;
+
+ handler_(result_ec, result_n);
}
}
@@ -529,8 +536,15 @@
break;
}
- handler_(search_position_ == not_found ? error::not_found : ec,
- ec || search_position_ == not_found ? 0 : search_position_);
+ const boost::system::error_code result_ec =
+ (search_position_ == not_found)
+ ? error::not_found : ec;
+
+ const std::size_t result_n =
+ (ec || search_position_ == not_found)
+ ? 0 : search_position_;
+
+ handler_(result_ec, result_n);
}
}
@@ -671,8 +685,15 @@
break;
}
- handler_(search_position_ == not_found ? error::not_found : ec,
- ec || search_position_ == not_found ? 0 : search_position_);
+ const boost::system::error_code result_ec =
+ (search_position_ == not_found)
+ ? error::not_found : ec;
+
+ const std::size_t result_n =
+ (ec || search_position_ == not_found)
+ ? 0 : search_position_;
+
+ handler_(result_ec, result_n);
}
}
@@ -811,8 +832,15 @@
break;
}
- handler_(search_position_ == not_found ? error::not_found : ec,
- ec || search_position_ == not_found ? 0 : search_position_);
+ const boost::system::error_code result_ec =
+ (search_position_ == not_found)
+ ? error::not_found : ec;
+
+ const std::size_t result_n =
+ (ec || search_position_ == not_found)
+ ? 0 : search_position_;
+
+ handler_(result_ec, result_n);
}
}
Modified: branches/release/boost/asio/impl/serial_port_base.ipp
==============================================================================
--- branches/release/boost/asio/impl/serial_port_base.ipp (original)
+++ branches/release/boost/asio/impl/serial_port_base.ipp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -253,12 +253,16 @@
storage.c_iflag &= ~(IXOFF | IXON);
# if defined(_BSD_SOURCE)
storage.c_cflag &= ~CRTSCTS;
+# elif defined(__QNXNTO__)
+ storage.c_cflag &= ~(IHFLOW | OHFLOW);
# endif
break;
case software:
storage.c_iflag |= IXOFF | IXON;
# if defined(_BSD_SOURCE)
storage.c_cflag &= ~CRTSCTS;
+# elif defined(__QNXNTO__)
+ storage.c_cflag &= ~(IHFLOW | OHFLOW);
# endif
break;
case hardware:
@@ -266,6 +270,10 @@
storage.c_iflag &= ~(IXOFF | IXON);
storage.c_cflag |= CRTSCTS;
break;
+# elif defined(__QNXNTO__)
+ storage.c_iflag &= ~(IXOFF | IXON);
+ storage.c_cflag |= (IHFLOW | OHFLOW);
+ break;
# else
ec = boost::asio::error::operation_not_supported;
return ec;
@@ -304,6 +312,11 @@
{
value_ = hardware;
}
+# elif defined(__QNXNTO__)
+ else if (storage.c_cflag & IHFLOW && storage.c_cflag & OHFLOW)
+ {
+ value_ = hardware;
+ }
# endif
else
{
Modified: branches/release/boost/asio/impl/write.hpp
==============================================================================
--- branches/release/boost/asio/impl/write.hpp (original)
+++ branches/release/boost/asio/impl/write.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -146,7 +146,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
@@ -198,7 +198,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
@@ -249,7 +249,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
Modified: branches/release/boost/asio/impl/write_at.hpp
==============================================================================
--- branches/release/boost/asio/impl/write_at.hpp (original)
+++ branches/release/boost/asio/impl/write_at.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -157,7 +157,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
@@ -211,7 +211,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
@@ -264,7 +264,7 @@
break;
}
- handler_(ec, static_cast<const std::size_t>(total_transferred_));
+ handler_(ec, static_cast<const std::size_t&>(total_transferred_));
}
}
Modified: branches/release/boost/asio/version.hpp
==============================================================================
--- branches/release/boost/asio/version.hpp (original)
+++ branches/release/boost/asio/version.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -18,6 +18,6 @@
// BOOST_ASIO_VERSION % 100 is the sub-minor version
// BOOST_ASIO_VERSION / 100 % 1000 is the minor version
// BOOST_ASIO_VERSION / 100000 is the major version
-#define BOOST_ASIO_VERSION 100406 // 1.4.6
+#define BOOST_ASIO_VERSION 100407 // 1.4.7
#endif // BOOST_ASIO_VERSION_HPP
Modified: branches/release/libs/asio/test/Jamfile
==============================================================================
--- branches/release/libs/asio/test/Jamfile (original)
+++ branches/release/libs/asio/test/Jamfile 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -27,6 +27,7 @@
template asio_unit_test
: <lib>@boost/libs/thread/build/boost_thread
<lib>@boost/libs/regex/build/boost_regex
+ <lib>@boost/libs/test/build/boost_test_exec_monitor
<lib>@boost_system/libs/system/build/boost_system
: <include>../../.. <include>@boost <include>@boost_system
<define>BOOST_ALL_NO_LIB=1
Modified: branches/release/libs/asio/test/Jamfile.v2
==============================================================================
--- branches/release/libs/asio/test/Jamfile.v2 (original)
+++ branches/release/libs/asio/test/Jamfile.v2 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -40,6 +40,7 @@
<library>/boost/system//boost_system
<library>/boost/thread//boost_thread
<library>/boost/regex//boost_regex
+ <library>/boost/test//boost_test_exec_monitor
<define>BOOST_ALL_NO_LIB=1
<threading>multi
<os>LINUX:<define>_XOPEN_SOURCE=600
Modified: branches/release/libs/asio/test/deadline_timer.cpp
==============================================================================
--- branches/release/libs/asio/test/deadline_timer.cpp (original)
+++ branches/release/libs/asio/test/deadline_timer.cpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -16,6 +16,7 @@
// Test that header file is self-contained.
#include <boost/asio/deadline_timer.hpp>
+#include <boost/thread.hpp>
#include <boost/bind.hpp>
#include <boost/asio/io_service.hpp>
#include <boost/asio/placeholders.hpp>
@@ -260,11 +261,37 @@
BOOST_CHECK(allocation_count == 0);
}
+void deadline_timer_thread_test()
+{
+ boost::asio::io_service ios;
+ boost::asio::io_service::work w(ios);
+ boost::asio::deadline_timer t1(ios);
+ boost::asio::deadline_timer t2(ios);
+ int count = 0;
+
+ boost::thread th(boost::bind(&boost::asio::io_service::run, &ios));
+
+ t2.expires_from_now(boost::posix_time::seconds(2));
+ t2.wait();
+
+ t1.expires_from_now(boost::posix_time::seconds(2));
+ t1.async_wait(boost::bind(increment, &count));
+
+ t2.expires_from_now(boost::posix_time::seconds(4));
+ t2.wait();
+
+ ios.stop();
+ th.join();
+
+ BOOST_CHECK(count == 1);
+}
+
test_suite* init_unit_test_suite(int, char*[])
{
test_suite* test = BOOST_TEST_SUITE("deadline_timer");
test->add(BOOST_TEST_CASE(&deadline_timer_test));
test->add(BOOST_TEST_CASE(&deadline_timer_cancel_test));
test->add(BOOST_TEST_CASE(&deadline_timer_custom_allocation_test));
+ test->add(BOOST_TEST_CASE(&deadline_timer_thread_test));
return test;
}
Modified: branches/release/libs/asio/test/io_service.cpp
==============================================================================
--- branches/release/libs/asio/test/io_service.cpp (original)
+++ branches/release/libs/asio/test/io_service.cpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -234,9 +234,80 @@
BOOST_CHECK(exception_count == 2);
}
+class test_service : public boost::asio::io_service::service
+{
+public:
+ static boost::asio::io_service::id id;
+ test_service(boost::asio::io_service& s)
+ : boost::asio::io_service::service(s) {}
+private:
+ virtual void shutdown_service() {}
+};
+
+boost::asio::io_service::id test_service::id;
+
+void io_service_service_test()
+{
+ boost::asio::io_service ios1;
+ boost::asio::io_service ios2;
+ boost::asio::io_service ios3;
+
+ // Implicit service registration.
+
+ boost::asio::use_service<test_service>(ios1);
+
+ BOOST_CHECK(boost::asio::has_service<test_service>(ios1));
+
+ test_service* svc1 = new test_service(ios1);
+ try
+ {
+ boost::asio::add_service(ios1, svc1);
+ BOOST_ERROR("add_service did not throw");
+ }
+ catch (boost::asio::service_already_exists&)
+ {
+ }
+ delete svc1;
+
+ // Explicit service registration.
+
+ test_service* svc2 = new test_service(ios2);
+ boost::asio::add_service(ios2, svc2);
+
+ BOOST_CHECK(boost::asio::has_service<test_service>(ios2));
+ BOOST_CHECK(&boost::asio::use_service<test_service>(ios2) == svc2);
+
+ test_service* svc3 = new test_service(ios2);
+ try
+ {
+ boost::asio::add_service(ios2, svc3);
+ BOOST_ERROR("add_service did not throw");
+ }
+ catch (boost::asio::service_already_exists&)
+ {
+ }
+ delete svc3;
+
+ // Explicit registration with invalid owner.
+
+ test_service* svc4 = new test_service(ios2);
+ try
+ {
+ boost::asio::add_service(ios3, svc4);
+ BOOST_ERROR("add_service did not throw");
+ }
+ catch (boost::asio::invalid_service_owner&)
+ {
+ }
+ delete svc4;
+
+ BOOST_CHECK(!boost::asio::has_service<test_service>(ios3));
+}
+
test_suite* init_unit_test_suite(int, char*[])
{
test_suite* test = BOOST_TEST_SUITE("io_service");
test->add(BOOST_TEST_CASE(&io_service_test));
+ test->add(BOOST_TEST_CASE(&io_service_service_test));
return test;
}
Modified: branches/release/libs/asio/test/ssl/Jamfile
==============================================================================
--- branches/release/libs/asio/test/ssl/Jamfile (original)
+++ branches/release/libs/asio/test/ssl/Jamfile 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -26,6 +26,7 @@
template unit_test
: <lib>@boost/libs/thread/build/boost_thread
<lib>@boost/libs/system/build/boost_system
+ : <lib>@boost/libs/test/build/boost_test_exec_monitor
: <include>../../../..
<define>BOOST_ALL_NO_LIB=1
<threading>multi
Modified: branches/release/libs/asio/test/ssl/Jamfile.v2
==============================================================================
--- branches/release/libs/asio/test/ssl/Jamfile.v2 (original)
+++ branches/release/libs/asio/test/ssl/Jamfile.v2 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -36,6 +36,7 @@
: requirements
<library>/boost/date_time//boost_date_time
<library>/boost/thread//boost_thread
+ <library>/boost/test//boost_test_exec_monitor
<define>BOOST_ALL_NO_LIB=1
<threading>multi
<os>SOLARIS:<library>socket
Modified: branches/release/libs/asio/test/unit_test.hpp
==============================================================================
--- branches/release/libs/asio/test/unit_test.hpp (original)
+++ branches/release/libs/asio/test/unit_test.hpp 2010-10-17 08:24:50 EDT (Sun, 17 Oct 2010)
@@ -35,7 +35,6 @@
#endif // defined(BOOST_MSVC)
#include <boost/test/unit_test.hpp>
-#include <boost/test/included/unit_test_framework.hpp>
using boost::unit_test::test_suite;
#if defined(BOOST_MSVC)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk