|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r67969 - in branches/release: . boost boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/fusion/container/list/detail boost/gil boost/graph boost/icl boost/integer boost/interprocess boost/intrusive boost/io boost/iostreams boost/iterator boost/msm boost/numeric/ublas boost/program_options boost/property_map boost/property_map/parallel boost/property_map/parallel/impl boost/property_tree boost/python 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/typeof boost/unordered boost/utility boost/uuid boost/variant boost/wave doc libs libs/array/doc libs/array/test libs/bimap libs/config libs/date_time libs/filesystem libs/functional/hash libs/fusion libs/graph_parallel libs/icl libs/icl/doc libs/icl/doc/html/header/boost/icl libs/icl/test/test_doc_code_ libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/math/doc libs/math/doc/sf_and_dist libs/math/doc/sf_and_dist/html/math_toolkit/main_overview libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/python libs/regex libs/serialization libs/serialization/doc libs/serialization/example libs/serialization/src libs/serialization/test libs/serialization/vc7ide 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/typeof/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/regression tools/regression/src tools/release tools/wave
From: jewillco_at_[hidden]
Date: 2011-01-11 13:34:08
Author: jewillco
Date: 2011-01-11 13:34:06 EST (Tue, 11 Jan 2011)
New Revision: 67969
URL: http://svn.boost.org/trac/boost/changeset/67969
Log:
Merged r67708 from trunk
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/archive/ (props changed)
branches/release/boost/array.hpp (props changed)
branches/release/boost/bimap/ (props changed)
branches/release/boost/concept_check.hpp (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/fusion/container/list/detail/build_cons.hpp (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/icl/ (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/iterator/iterator_facade.hpp (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/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/token_functions.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/typeof/message.hpp (props changed)
branches/release/boost/typeof/register_functions.hpp (props changed)
branches/release/boost/typeof/register_functions_iterate.hpp (props changed)
branches/release/boost/typeof/typeof.hpp (props changed)
branches/release/boost/typeof/unsupported.hpp (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/array/doc/array.xml (props changed)
branches/release/libs/array/test/Jamfile.v2 (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/array/test/array2.cpp (props changed)
branches/release/libs/array/test/array6.cpp (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/date_time/ (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/icl/ (props changed)
branches/release/libs/icl/doc/ (props changed)
branches/release/libs/icl/doc/html/header/boost/icl/ (props changed)
branches/release/libs/icl/test/test_doc_code_/ (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/ (props changed)
branches/release/libs/math/doc/sf_and_dist/ (props changed)
branches/release/libs/math/doc/sf_and_dist/html/math_toolkit/main_overview/faq.html (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/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/regex/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/serialization/doc/ (props changed)
branches/release/libs/serialization/example/ (props changed)
branches/release/libs/serialization/src/ (props changed)
branches/release/libs/serialization/test/test_diamond_complex.cpp (props changed)
branches/release/libs/serialization/vc7ide/ (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/typeof/doc/typeof.qbk (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/build/v2/user-config.jam (props changed)
branches/release/tools/inspect/ (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/property_map/parallel/distributed_property_map.hpp | 5 +++--
branches/release/boost/property_map/parallel/impl/distributed_property_map.ipp | 19 ++++++++++---------
branches/release/boost/property_map/parallel/local_property_map.hpp | 6 +++---
branches/release/boost/property_map/property_map.hpp | 4 ++--
4 files changed, 18 insertions(+), 16 deletions(-)
Modified: branches/release/boost/property_map/parallel/distributed_property_map.hpp
==============================================================================
--- branches/release/boost/property_map/parallel/distributed_property_map.hpp (original)
+++ branches/release/boost/property_map/parallel/distributed_property_map.hpp 2011-01-11 13:34:06 EST (Tue, 11 Jan 2011)
@@ -21,6 +21,7 @@
#error "Parallel BGL files should not be included unless <boost/graph/use_mpi.hpp> has been included"
#endif
+#include <boost/assert.hpp>
#include <boost/type_traits/is_base_and_derived.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
@@ -83,7 +84,7 @@
template<typename PropertyMap, typename Key, typename Value>
static inline void
do_put(PropertyMap, const Key&, const Value&)
- { assert(false); }
+ { BOOST_ASSERT(false); }
};
template<>
@@ -134,7 +135,7 @@
template<typename PropertyMap, typename Key, typename Value>
inline void
maybe_put_impl(PropertyMap, const Key&, const Value&, ...)
- { assert(false); }
+ { BOOST_ASSERT(false); }
template<typename PropertyMap, typename Key, typename Value>
inline void
Modified: branches/release/boost/property_map/parallel/impl/distributed_property_map.ipp
==============================================================================
--- branches/release/boost/property_map/parallel/impl/distributed_property_map.ipp (original)
+++ branches/release/boost/property_map/parallel/impl/distributed_property_map.ipp 2011-01-11 13:34:06 EST (Tue, 11 Jan 2011)
@@ -7,6 +7,7 @@
// Authors: Douglas Gregor
// Nick Edmonds
// Andrew Lumsdaine
+#include <boost/assert.hpp>
#include <boost/property_map/parallel/distributed_property_map.hpp>
#include <boost/graph/parallel/detail/untracked_pair.hpp>
#include <boost/type_traits/is_base_and_derived.hpp>
@@ -46,7 +47,7 @@
typedef handle_message<Reduce> Handler;
data->process_group.replace_handler(Handler(data, reduce));
Handler* handler = data->process_group.template get_receiver<Handler>();
- assert(handler);
+ BOOST_ASSERT(handler);
handler->setup_triggers(data->process_group);
data->get_default_value = reduce;
data->has_default_resolver = Reduce::non_default_resolver;
@@ -121,7 +122,7 @@
PBGL_DISTRIB_PMAP
::handle_message<Reduce>::operator()(process_id_type source, int tag)
{
- assert(false);
+ BOOST_ASSERT(false);
}
template<typename ProcessGroup, typename GlobalMap, typename StorageMap>
@@ -136,7 +137,7 @@
shared_ptr<data_t> data(data_ptr);
owner_local_pair p = get(data->global, req.first);
- assert(p.first == process_id(data->process_group));
+ BOOST_ASSERT(p.first == process_id(data->process_group));
detail::maybe_put(data->storage, p.second,
reduce(req.first,
@@ -154,7 +155,7 @@
using boost::get;
shared_ptr<data_t> data(data_ptr);
- assert(data);
+ BOOST_ASSERT(data);
owner_local_pair p = get(data->global, key);
return get(data->storage, p.second);
@@ -168,7 +169,7 @@
trigger_receive_context)
{
shared_ptr<data_t> data(data_ptr);
- assert(data);
+ BOOST_ASSERT(data);
typedef boost::parallel::detail::untracked_pair<key_type, value_type> key_value;
std::vector<key_value> results;
@@ -194,7 +195,7 @@
trigger_receive_context)
{
shared_ptr<data_t> data(data_ptr);
- assert(data);
+ BOOST_ASSERT(data);
// Index by key
ghost_cells_key_index_type const& key_index
@@ -223,7 +224,7 @@
using boost::get;
shared_ptr<data_t> data(data_ptr);
- assert(data);
+ BOOST_ASSERT(data);
std::size_t n = values.size();
for (std::size_t i = 0; i < n; ++i) {
@@ -261,7 +262,7 @@
{
int stage=0; // we only get called at the start now
shared_ptr<data_t> data(data_ptr);
- assert(data);
+ BOOST_ASSERT(data);
// Determine in which stage backward consistency messages should be sent.
int backward_stage = -1;
@@ -422,7 +423,7 @@
void PBGL_DISTRIB_PMAP::data_t::do_reset()
{
Resolver* resolver = get_default_value.template target<Resolver>();
- assert(resolver);
+ BOOST_ASSERT(resolver);
for (iterator i = ghost_cells->begin(); i != ghost_cells->end(); ++i)
const_cast<value_type&>(i->second) = (*resolver)(i->first);
Modified: branches/release/boost/property_map/parallel/local_property_map.hpp
==============================================================================
--- branches/release/boost/property_map/parallel/local_property_map.hpp (original)
+++ branches/release/boost/property_map/parallel/local_property_map.hpp 2011-01-11 13:34:06 EST (Tue, 11 Jan 2011)
@@ -20,7 +20,7 @@
#error "Parallel BGL files should not be included unless <boost/graph/use_mpi.hpp> has been included"
#endif
-#include <cassert>
+#include <boost/assert.hpp>
namespace boost {
/** Property map that accesses an underlying, local property map
@@ -47,7 +47,7 @@
reference operator[](const key_type& key)
{
owner_local_pair p = get(global_, key);
- assert(p.first == process_id(process_group_));
+ BOOST_ASSERT(p.first == process_id(process_group_));
return storage[p.second];
}
@@ -84,7 +84,7 @@
::value_type const& v)
{
typename property_traits<GlobalMap>::value_type p = get(pm.global(), key);
- assert(p.first == process_id(pm.process_group()));
+ BOOST_ASSERT(p.first == process_id(pm.process_group()));
put(pm.base(), p.second, v);
}
} // end namespace boost
Modified: branches/release/boost/property_map/property_map.hpp
==============================================================================
--- branches/release/boost/property_map/property_map.hpp (original)
+++ branches/release/boost/property_map/property_map.hpp 2011-01-11 13:34:06 EST (Tue, 11 Jan 2011)
@@ -11,7 +11,7 @@
#ifndef BOOST_PROPERTY_MAP_HPP
#define BOOST_PROPERTY_MAP_HPP
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp>
#include <boost/pending/cstddef.hpp>
#include <boost/detail/iterator.hpp>
@@ -444,7 +444,7 @@
: iter(first), n(n_), index(_id) { }
inline safe_iterator_property_map() { }
inline R operator[](key_type v) const {
- assert(get(index, v) < n);
+ BOOST_ASSERT(get(index, v) < n);
return *(iter + get(index, v)) ;
}
typename property_traits<IndexMap>::value_type size() const { return n; }
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