|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r63660 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/gil boost/graph boost/integer boost/interprocess boost/intrusive boost/iostreams boost/math boost/msm 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/array/doc libs/array/test libs/bimap libs/config libs/config/test libs/filesystem libs/functional/hash libs/fusion libs/graph_parallel libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/program_options libs/property_tree libs/python libs/python/doc/v2 libs/range libs/range/doc libs/regex libs/serialization 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/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/build/v2/tools tools/inspect tools/jam tools/quickbook tools/regression tools/release tools/wave
From: jewillco_at_[hidden]
Date: 2010-07-05 11:48:18
Author: jewillco
Date: 2010-07-05 11:48:17 EDT (Mon, 05 Jul 2010)
New Revision: 63660
URL: http://svn.boost.org/trac/boost/changeset/63660
Log:
Merged r63630 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/algorithm/string/ (props changed)
branches/release/boost/archive/ (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/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/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/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/serialization/factory.hpp (props changed)
branches/release/boost/signals/ (props changed)
branches/release/boost/signals2/ (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/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/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/config/test/boost_no_com_value_init.ipp (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/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/program_options/ (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/python/doc/v2/args.html (props changed)
branches/release/libs/python/doc/v2/return_internal_reference.html (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/range/doc/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/serialization/ (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/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_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/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/tools/ (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/jam/ (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/boost/graph/depth_first_search.hpp | 2
branches/release/boost/graph/named_function_params.hpp | 62 +++++++++++++++++++++++++++++----------
branches/release/boost/graph/random_spanning_tree.hpp | 2
3 files changed, 48 insertions(+), 18 deletions(-)
Modified: branches/release/boost/graph/depth_first_search.hpp
==============================================================================
--- branches/release/boost/graph/depth_first_search.hpp (original)
+++ branches/release/boost/graph/depth_first_search.hpp 2010-07-05 11:48:17 EDT (Mon, 05 Jul 2010)
@@ -297,7 +297,7 @@
depth_first_search
(g,
arg_pack[_visitor | make_dfs_visitor(null_visitor())],
- boost::detail::color_map_maker<VertexListGraph, arg_pack_type>::make_map(g, arg_pack),
+ boost::detail::make_color_map_from_arg_pack(g, arg_pack),
arg_pack[_root_vertex | *vertices(g).first]
);
}
Modified: branches/release/boost/graph/named_function_params.hpp
==============================================================================
--- branches/release/boost/graph/named_function_params.hpp (original)
+++ branches/release/boost/graph/named_function_params.hpp 2010-07-05 11:48:17 EDT (Mon, 05 Jul 2010)
@@ -441,7 +441,7 @@
namespace detail {
template <bool Exists, typename Graph, typename ArgPack, typename Value, typename PM>
- struct color_map_maker_helper {
+ struct map_maker_helper {
typedef PM map_type;
static PM make_map(const Graph&, Value, const PM& pm, const ArgPack&) {
return pm;
@@ -449,7 +449,7 @@
};
template <typename Graph, typename ArgPack, typename Value, typename PM>
- struct color_map_maker_helper<false, Graph, ArgPack, Value, PM> {
+ struct map_maker_helper<false, Graph, ArgPack, Value, PM> {
typedef typename boost::remove_const<
typename override_const_property_t<
typename boost::parameter::value_type<
@@ -476,27 +476,57 @@
}
};
- template <typename Graph, typename ArgPack>
- struct color_map_maker {
+ template <typename Graph, typename ArgPack, typename MapTag, typename ValueType>
+ struct map_maker {
BOOST_STATIC_CONSTANT(
bool,
- has_color_map =
- (parameter_exists<ArgPack, boost::graph::keywords::tag::color_map>
+ has_map =
+ (parameter_exists<ArgPack, MapTag>
::value));
- typedef color_map_maker_helper<has_color_map, Graph, ArgPack, default_color_type,
- typename boost::remove_const<
- typename boost::parameter::value_type<
- ArgPack,
- boost::graph::keywords::tag::color_map,
- int
- >::type
- >::type> helper;
+ typedef map_maker_helper<has_map, Graph, ArgPack, ValueType,
+ typename boost::remove_const<
+ typename boost::parameter::value_type<
+ ArgPack,
+ MapTag,
+ int
+ >::type
+ >::type> helper;
typedef typename helper::map_type map_type;
- static map_type make_map(const Graph& g, const ArgPack& ap) {
- return helper::make_map(g, white_color, ap[boost::graph::keywords::_color_map | 0], ap);
+ static map_type make_map(const Graph& g, const ArgPack& ap, ValueType default_value) {
+ return helper::make_map(g, default_value, ap[::boost::parameter::keyword<MapTag>::instance | 0], ap);
}
};
+ template <typename MapTag, typename ValueType = void>
+ class make_property_map_from_arg_pack_gen {
+ ValueType default_value;
+
+ public:
+ make_property_map_from_arg_pack_gen(ValueType default_value)
+ : default_value(default_value) {}
+
+ template <typename Graph, typename ArgPack>
+ typename map_maker<Graph, ArgPack, MapTag, ValueType>::map_type
+ operator()(const Graph& g, const ArgPack& ap) const {
+ return map_maker<Graph, ArgPack, MapTag, ValueType>::make_map(g, ap, default_value);
+ }
+ };
+
+ template <typename MapTag>
+ class make_property_map_from_arg_pack_gen<MapTag, void> {
+ public:
+ template <typename ValueType, typename Graph, typename ArgPack>
+ typename map_maker<Graph, ArgPack, MapTag, ValueType>::map_type
+ operator()(const Graph& g, const ArgPack& ap, ValueType default_value) const {
+ return map_maker<Graph, ArgPack, MapTag, ValueType>::make_map(g, ap, default_value);
+ }
+ };
+
+ static const
+ make_property_map_from_arg_pack_gen<
+ boost::graph::keywords::tag::color_map,
+ default_color_type>
+ make_color_map_from_arg_pack(white_color);
}
} // namespace boost
Modified: branches/release/boost/graph/random_spanning_tree.hpp
==============================================================================
--- branches/release/boost/graph/random_spanning_tree.hpp (original)
+++ branches/release/boost/graph/random_spanning_tree.hpp 2010-07-05 11:48:17 EDT (Mon, 05 Jul 2010)
@@ -100,7 +100,7 @@
arg_pack[_root_vertex | *vertices(g).first],
arg_pack[_predecessor_map],
arg_pack[_weight_map | static_property_map<double>(1.)],
- boost::detail::color_map_maker<Graph, arg_pack_type>::make_map(g, arg_pack));
+ boost::detail::make_color_map_from_arg_pack(g, arg_pack));
}
}
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