Subject: [Boost-commit] svn:boost r52226 - in trunk: boost boost/bimap/property_map boost/graph boost/graph/detail boost/graph/planar_detail boost/graph/property_maps boost/mpi boost/pending boost/property_map libs/graph libs/graph/doc libs/graph/example libs/graph/test libs/property_map libs/property_map/test libs/python/src/object libs/signals/test
From: jewillco_at_[hidden]
Date: 2009-04-06 21:28:56
Author: jewillco
Date: 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
New Revision: 52226
URL: http://svn.boost.org/trac/boost/changeset/52226
Log:
Moved property map library into property_map/ directory; made old files into stubs with #warnings; converted uses and docs of property map library to use new names
Added:
trunk/boost/property_map/
trunk/boost/property_map/dynamic_property_map.hpp
- copied, changed from r52225, /trunk/boost/dynamic_property_map.hpp
trunk/boost/property_map/property_map.hpp
- copied, changed from r52225, /trunk/boost/property_map.hpp
trunk/boost/property_map/property_map_iterator.hpp
- copied, changed from r52225, /trunk/boost/property_map_iterator.hpp
trunk/boost/property_map/vector_property_map.hpp
- copied, changed from r52225, /trunk/boost/vector_property_map.hpp
Text files modified:
trunk/boost/bimap/property_map/set_support.hpp | 2
trunk/boost/bimap/property_map/unordered_set_support.hpp | 2
trunk/boost/dynamic_property_map.hpp | 381 ------------------------
trunk/boost/graph/adjacency_list.hpp | 2
trunk/boost/graph/astar_search.hpp | 4
trunk/boost/graph/bc_clustering.hpp | 2
trunk/boost/graph/betweenness_centrality.hpp | 2
trunk/boost/graph/biconnected_components.hpp | 2
trunk/boost/graph/chrobak_payne_drawing.hpp | 2
trunk/boost/graph/copy.hpp | 2
trunk/boost/graph/create_condensation_graph.hpp | 2
trunk/boost/graph/detail/adjacency_list.hpp | 2
trunk/boost/graph/detail/d_ary_heap.hpp | 2
trunk/boost/graph/detail/read_graphviz_spirit.hpp | 2
trunk/boost/graph/detail/self_avoiding_walk.hpp | 2
trunk/boost/graph/detail/sparse_ordering.hpp | 2
trunk/boost/graph/dijkstra_shortest_paths.hpp | 4
trunk/boost/graph/edmonds_karp_max_flow.hpp | 2
trunk/boost/graph/floyd_warshall_shortest.hpp | 2
trunk/boost/graph/graph_archetypes.hpp | 2
trunk/boost/graph/graph_as_tree.hpp | 2
trunk/boost/graph/graph_concepts.hpp | 2
trunk/boost/graph/graphviz.hpp | 4
trunk/boost/graph/is_kuratowski_subgraph.hpp | 2
trunk/boost/graph/is_straight_line_drawing.hpp | 2
trunk/boost/graph/johnson_all_pairs_shortest.hpp | 2
trunk/boost/graph/kolmogorov_max_flow.hpp | 2
trunk/boost/graph/kruskal_min_spanning_tree.hpp | 2
trunk/boost/graph/make_biconnected_planar.hpp | 2
trunk/boost/graph/make_connected.hpp | 2
trunk/boost/graph/make_maximal_planar.hpp | 2
trunk/boost/graph/max_cardinality_matching.hpp | 2
trunk/boost/graph/minimum_degree_ordering.hpp | 2
trunk/boost/graph/page_rank.hpp | 2
trunk/boost/graph/planar_canonical_ordering.hpp | 2
trunk/boost/graph/planar_detail/add_edge_visitors.hpp | 2
trunk/boost/graph/planar_detail/boyer_myrvold_impl.hpp | 2
trunk/boost/graph/planar_detail/bucket_sort.hpp | 2
trunk/boost/graph/properties.hpp | 4
trunk/boost/graph/property_iter_range.hpp | 2
trunk/boost/graph/property_maps/constant_property_map.hpp | 2
trunk/boost/graph/property_maps/container_property_map.hpp | 2
trunk/boost/graph/relax.hpp | 2
trunk/boost/graph/sequential_vertex_coloring.hpp | 2
trunk/boost/graph/sloan_ordering.hpp | 2
trunk/boost/graph/stanford_graph.hpp | 2
trunk/boost/graph/topological_sort.hpp | 2
trunk/boost/graph/two_bit_color_map.hpp | 2
trunk/boost/graph/vector_as_graph.hpp | 2
trunk/boost/graph/visitors.hpp | 2
trunk/boost/mpi/graph_communicator.hpp | 2
trunk/boost/pending/fibonacci_heap.hpp | 2
trunk/boost/pending/indirect_cmp.hpp | 2
trunk/boost/pending/mutable_queue.hpp | 2
trunk/boost/pending/relaxed_heap.hpp | 2
trunk/boost/property_map.hpp | 602 ---------------------------------------
trunk/boost/property_map/dynamic_property_map.hpp | 2
trunk/boost/property_map/property_map.hpp | 2
trunk/boost/property_map/property_map_iterator.hpp | 2
trunk/boost/property_map/vector_property_map.hpp | 2
trunk/boost/property_map_iterator.hpp | 128 +-------
trunk/boost/vector_property_map.hpp | 108 ------
trunk/libs/graph/doc/PlanarEmbedding.html | 4
trunk/libs/graph/doc/biconnected_components.w | 2
trunk/libs/graph/doc/eg1-iso.cpp | 2
trunk/libs/graph/doc/isomorphism-impl.w | 2
trunk/libs/graph/doc/trouble_shooting.html | 3
trunk/libs/graph/doc/using_property_maps.html | 2
trunk/libs/graph/example/adjacency_list.cpp | 2
trunk/libs/graph/example/bfs.cpp | 2
trunk/libs/graph/example/bfs_neighbor.cpp | 2
trunk/libs/graph/example/canonical_ordering.cpp | 2
trunk/libs/graph/example/city_visitor.cpp | 2
trunk/libs/graph/example/edge_property.cpp | 2
trunk/libs/graph/example/exterior_properties.cpp | 2
trunk/libs/graph/example/exterior_property_map.cpp | 2
trunk/libs/graph/example/interior_pmap_bundled.cpp | 2
trunk/libs/graph/example/interior_property_map.cpp | 2
trunk/libs/graph/example/iterator-property-map-eg.cpp | 2
trunk/libs/graph/example/johnson-eg.cpp | 2
trunk/libs/graph/example/knights-tour.cpp | 2
trunk/libs/graph/example/kuratowski_subgraph.cpp | 2
trunk/libs/graph/example/make_biconnected_planar.cpp | 2
trunk/libs/graph/example/make_connected.cpp | 2
trunk/libs/graph/example/make_maximal_planar.cpp | 2
trunk/libs/graph/example/neighbor_bfs.cpp | 2
trunk/libs/graph/example/planar_face_traversal.cpp | 2
trunk/libs/graph/example/put-get-helper-eg.cpp | 2
trunk/libs/graph/example/straight_line_drawing.cpp | 2
trunk/libs/graph/module.cmake | 2
trunk/libs/graph/test/adjacency_matrix_test.cpp | 2
trunk/libs/graph/test/all_planar_input_files_test.cpp | 2
trunk/libs/graph/test/basic_planarity_test.cpp | 4
trunk/libs/graph/test/betweenness_centrality_test.cpp | 2
trunk/libs/graph/test/core_numbers_test.cpp | 2
trunk/libs/graph/test/dag_longest_paths.cpp | 2
trunk/libs/graph/test/graphviz_test.cpp | 2
trunk/libs/graph/test/is_straight_line_draw_test.cpp | 2
trunk/libs/graph/test/isomorphism.cpp | 2
trunk/libs/graph/test/johnson-test.cpp | 2
trunk/libs/graph/test/kolmogorov_max_flow_test.cpp | 2
trunk/libs/graph/test/make_bicon_planar_test.cpp | 4
trunk/libs/graph/test/make_connected_test.cpp | 4
trunk/libs/graph/test/make_maximal_planar_test.cpp | 4
trunk/libs/graph/test/matching_test.cpp | 2
trunk/libs/graph/test/max_flow_test.cpp | 2
trunk/libs/graph/test/parallel_edges_loops_test.cpp | 2
trunk/libs/graph/test/random_matching_test.cpp | 2
trunk/libs/property_map/associative_property_map.html | 4
trunk/libs/property_map/const_assoc_property_map.html | 4
trunk/libs/property_map/example1.cpp | 2
trunk/libs/property_map/example2.cpp | 2
trunk/libs/property_map/example3.cpp | 2
trunk/libs/property_map/identity_property_map.html | 2
trunk/libs/property_map/iterator_property_map.html | 2
trunk/libs/property_map/property_map.html | 8
trunk/libs/property_map/ref_property_map.html | 2
trunk/libs/property_map/test/dynamic_properties_test.cpp | 4
trunk/libs/property_map/test/property_map_cc.cpp | 2
trunk/libs/property_map/vector_property_map.html | 4
trunk/libs/python/src/object/inheritance.cpp | 2
trunk/libs/signals/test/random_signal_system.cpp | 2
122 files changed, 194 insertions(+), 1294 deletions(-)
Modified: trunk/boost/bimap/property_map/set_support.hpp
==============================================================================
--- trunk/boost/bimap/property_map/set_support.hpp (original)
+++ trunk/boost/bimap/property_map/set_support.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -18,7 +18,7 @@
#include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/bimap/set_of.hpp>
#include <boost/bimap/support/data_type_by.hpp>
#include <boost/bimap/support/key_type_by.hpp>
Modified: trunk/boost/bimap/property_map/unordered_set_support.hpp
==============================================================================
--- trunk/boost/bimap/property_map/unordered_set_support.hpp (original)
+++ trunk/boost/bimap/property_map/unordered_set_support.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -18,7 +18,7 @@
#include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/bimap/unordered_set_of.hpp>
#include <boost/bimap/support/data_type_by.hpp>
#include <boost/bimap/support/key_type_by.hpp>
Modified: trunk/boost/dynamic_property_map.hpp
==============================================================================
--- trunk/boost/dynamic_property_map.hpp (original)
+++ trunk/boost/dynamic_property_map.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -1,370 +1,17 @@
-#ifndef DYNAMIC_PROPERTY_MAP_RG09302004_HPP
-#define DYNAMIC_PROPERTY_MAP_RG09302004_HPP
+/*=============================================================================
+Copyright (c) 2009 Trustees of Indiana University
-// Copyright 2004-5 The Trustees of Indiana University.
-
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// dynamic_property_map.hpp -
-// Support for runtime-polymorphic property maps. This header is factored
-// out of Doug Gregor's routines for reading GraphML files for use in reading
-// GraphViz graph files.
-
-// Authors: Doug Gregor
-// Ronald Garcia
-//
-
-
-#include <boost/config.hpp>
-#include <boost/property_map.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/any.hpp>
-#include <boost/function/function3.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <typeinfo>
-#include <boost/mpl/bool.hpp>
-#include <stdexcept>
-#include <sstream>
-#include <map>
-#include <boost/type.hpp>
-
-namespace boost {
-
-namespace detail {
-
- // read_value -
- // A wrapper around lexical_cast, which does not behave as
- // desired for std::string types.
- template<typename Value>
- inline Value read_value(const std::string& value)
- { return boost::lexical_cast<Value>(value); }
-
- template<>
- inline std::string read_value<std::string>(const std::string& value)
- { return value; }
-
-}
-
-
-// dynamic_property_map -
-// This interface supports polymorphic manipulation of property maps.
-class dynamic_property_map
-{
-public:
- virtual ~dynamic_property_map() { }
-
- virtual boost::any get(const any& key) = 0;
- virtual std::string get_string(const any& key) = 0;
- virtual void put(const any& key, const any& value) = 0;
- virtual const std::type_info& key() const = 0;
- virtual const std::type_info& value() const = 0;
-};
-
-
-//////////////////////////////////////////////////////////////////////
-// Property map exceptions
-//////////////////////////////////////////////////////////////////////
-
-struct dynamic_property_exception : public std::exception {
- virtual ~dynamic_property_exception() throw() {}
- virtual const char* what() const throw() = 0;
-};
-
-struct property_not_found : public dynamic_property_exception {
- std::string property;
- mutable std::string statement;
- property_not_found(const std::string& property) : property(property) {}
- virtual ~property_not_found() throw() {}
-
- const char* what() const throw() {
- if(statement.empty())
- statement =
- std::string("Property not found: ") + property + ".";
-
- return statement.c_str();
- }
-};
-
-struct dynamic_get_failure : public dynamic_property_exception {
- std::string property;
- mutable std::string statement;
- dynamic_get_failure(const std::string& property) : property(property) {}
- virtual ~dynamic_get_failure() throw() {}
-
- const char* what() const throw() {
- if(statement.empty())
- statement =
- std::string(
- "dynamic property get cannot retrieve value for property: ")
- + property + ".";
-
- return statement.c_str();
- }
-};
-
-struct dynamic_const_put_error : public dynamic_property_exception {
- virtual ~dynamic_const_put_error() throw() {}
-
- const char* what() const throw() {
- return "Attempt to put a value into a const property map: ";
- }
-};
-
-
-namespace detail {
-
-//
-// dynamic_property_map_adaptor -
-// property-map adaptor to support runtime polymorphism.
-template<typename PropertyMap>
-class dynamic_property_map_adaptor : public dynamic_property_map
-{
- typedef typename property_traits<PropertyMap>::key_type key_type;
- typedef typename property_traits<PropertyMap>::value_type value_type;
- typedef typename property_traits<PropertyMap>::category category;
-
- // do_put - overloaded dispatches from the put() member function.
- // Attempts to "put" to a property map that does not model
- // WritablePropertyMap result in a runtime exception.
-
- // in_value must either hold an object of value_type or a string that
- // can be converted to value_type via iostreams.
- void do_put(const any& in_key, const any& in_value, mpl::bool_<true>)
- {
-#if !(defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95))
- using boost::put;
-#endif
-
- key_type key = any_cast<key_type>(in_key);
- if (in_value.type() == typeid(value_type)) {
-#if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95)
- boost::put(property_map, key, any_cast<value_type>(in_value));
-#else
- put(property_map, key, any_cast<value_type>(in_value));
+Distributed under the Boost Software License, Version 1.0. (See accompanying
+file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+// Redirect/warning header, adapted from the version in Spirit
+
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+# pragma message ("Warning: This header is deprecated. Please use: boost/property_map/dynamic_property_map.hpp")
+#elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
+# warning "This header is deprecated. Please use: boost/property_map/dynamic_property_map.hpp"
#endif
- } else {
- // if in_value is an empty string, put a default constructed value_type.
- std::string v = any_cast<std::string>(in_value);
- if (v.empty()) {
-#if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95)
- boost::put(property_map, key, value_type());
-#else
- put(property_map, key, value_type());
#endif
- } else {
-#if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95)
- boost::put(property_map, key, detail::read_value<value_type>(v));
-#else
- put(property_map, key, detail::read_value<value_type>(v));
-#endif
- }
- }
- }
-
- void do_put(const any&, const any&, mpl::bool_<false>)
- {
- throw dynamic_const_put_error();
- }
-
-public:
- explicit dynamic_property_map_adaptor(const PropertyMap& property_map)
- : property_map(property_map) { }
-
- virtual boost::any get(const any& key)
- {
-#if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95)
- return boost::get(property_map, any_cast<key_type>(key));
-#else
- using boost::get;
-
- return get(property_map, any_cast<key_type>(key));
-#endif
- }
-
- virtual std::string get_string(const any& key)
- {
-#if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95)
- std::ostringstream out;
- out << boost::get(property_map, any_cast<key_type>(key));
- return out.str();
-#else
- using boost::get;
-
- std::ostringstream out;
- out << get(property_map, any_cast<key_type>(key));
- return out.str();
-#endif
- }
-
- virtual void put(const any& in_key, const any& in_value)
- {
- do_put(in_key, in_value,
- mpl::bool_<(is_convertible<category*,
- writable_property_map_tag*>::value)>());
- }
-
- virtual const std::type_info& key() const { return typeid(key_type); }
- virtual const std::type_info& value() const { return typeid(value_type); }
-
- PropertyMap& base() { return property_map; }
- const PropertyMap& base() const { return property_map; }
-
-private:
- PropertyMap property_map;
-};
-
-} // namespace detail
-
-//
-// dynamic_properties -
-// container for dynamic property maps
-//
-struct dynamic_properties
-{
- typedef std::multimap<std::string, dynamic_property_map*>
- property_maps_type;
- typedef boost::function3<std::auto_ptr<dynamic_property_map>,
- const std::string&,
- const boost::any&,
- const boost::any&> generate_fn_type;
-public:
-
- typedef property_maps_type::iterator iterator;
- typedef property_maps_type::const_iterator const_iterator;
-
- dynamic_properties() : generate_fn() { }
- dynamic_properties(const generate_fn_type& g) : generate_fn(g) {}
-
- ~dynamic_properties()
- {
- for (property_maps_type::iterator i = property_maps.begin();
- i != property_maps.end(); ++i) {
- delete i->second;
- }
- }
-
- template<typename PropertyMap>
- dynamic_properties&
- property(const std::string& name, PropertyMap property_map)
- {
- // Tbd: exception safety
- std::auto_ptr<dynamic_property_map> pm(
- new detail::dynamic_property_map_adaptor<PropertyMap>(property_map));
- property_maps_type::iterator i =
- property_maps.insert(property_maps_type::value_type(name, (dynamic_property_map*)0));
- i->second = pm.release();
-
- return *this;
- }
-
- iterator begin() { return property_maps.begin(); }
- const_iterator begin() const { return property_maps.begin(); }
- iterator end() { return property_maps.end(); }
- const_iterator end() const { return property_maps.end(); }
-
- iterator lower_bound(const std::string& name)
- { return property_maps.lower_bound(name); }
-
- const_iterator lower_bound(const std::string& name) const
- { return property_maps.lower_bound(name); }
-
- void
- insert(const std::string& name, std::auto_ptr<dynamic_property_map> pm)
- {
- property_maps.insert(property_maps_type::value_type(name, pm.release()));
- }
-
- template<typename Key, typename Value>
- std::auto_ptr<dynamic_property_map>
- generate(const std::string& name, const Key& key, const Value& value)
- {
- if(!generate_fn) {
- throw property_not_found(name);
- } else {
- return generate_fn(name,key,value);
- }
- }
-
-private:
- property_maps_type property_maps;
- generate_fn_type generate_fn;
-};
-
-template<typename Key, typename Value>
-bool
-put(const std::string& name, dynamic_properties& dp, const Key& key,
- const Value& value)
-{
- for (dynamic_properties::iterator i = dp.lower_bound(name);
- i != dp.end() && i->first == name; ++i) {
- if (i->second->key() == typeid(key)) {
- i->second->put(key, value);
- return true;
- }
- }
-
- std::auto_ptr<dynamic_property_map> new_map = dp.generate(name, key, value);
- if (new_map.get()) {
- new_map->put(key, value);
- dp.insert(name, new_map);
- return true;
- } else {
- return false;
- }
-}
-
-#ifndef BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
-template<typename Value, typename Key>
-Value
-get(const std::string& name, const dynamic_properties& dp, const Key& key)
-{
- for (dynamic_properties::const_iterator i = dp.lower_bound(name);
- i != dp.end() && i->first == name; ++i) {
- if (i->second->key() == typeid(key))
- return any_cast<Value>(i->second->get(key));
- }
-
- throw dynamic_get_failure(name);
-}
-#endif
-
-template<typename Value, typename Key>
-Value
-get(const std::string& name, const dynamic_properties& dp, const Key& key, type<Value>)
-{
- for (dynamic_properties::const_iterator i = dp.lower_bound(name);
- i != dp.end() && i->first == name; ++i) {
- if (i->second->key() == typeid(key))
- return any_cast<Value>(i->second->get(key));
- }
-
- throw dynamic_get_failure(name);
-}
-
-template<typename Key>
-std::string
-get(const std::string& name, const dynamic_properties& dp, const Key& key)
-{
- for (dynamic_properties::const_iterator i = dp.lower_bound(name);
- i != dp.end() && i->first == name; ++i) {
- if (i->second->key() == typeid(key))
- return i->second->get_string(key);
- }
-
- throw dynamic_get_failure(name);
-}
-
-// The easy way to ignore properties.
-inline
-std::auto_ptr<boost::dynamic_property_map>
-ignore_other_properties(const std::string&,
- const boost::any&,
- const boost::any&) {
- return std::auto_ptr<boost::dynamic_property_map>(0);
-}
-
-} // namespace boost
-
-#endif // DYNAMIC_PROPERTY_MAP_RG09302004_HPP
Modified: trunk/boost/graph/adjacency_list.hpp
==============================================================================
--- trunk/boost/graph/adjacency_list.hpp (original)
+++ trunk/boost/graph/adjacency_list.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -38,7 +38,7 @@
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/graph_selectors.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/and.hpp>
#include <boost/mpl/not.hpp>
Modified: trunk/boost/graph/astar_search.hpp
==============================================================================
--- trunk/boost/graph/astar_search.hpp (original)
+++ trunk/boost/graph/astar_search.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -22,8 +22,8 @@
#include <boost/graph/exception.hpp>
#include <boost/graph/breadth_first_search.hpp>
#include <boost/graph/detail/d_ary_heap.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
namespace boost {
Modified: trunk/boost/graph/bc_clustering.hpp
==============================================================================
--- trunk/boost/graph/bc_clustering.hpp (original)
+++ trunk/boost/graph/bc_clustering.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -14,7 +14,7 @@
#include <boost/pending/indirect_cmp.hpp>
#include <algorithm>
#include <vector>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost {
Modified: trunk/boost/graph/betweenness_centrality.hpp
==============================================================================
--- trunk/boost/graph/betweenness_centrality.hpp (original)
+++ trunk/boost/graph/betweenness_centrality.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -20,7 +20,7 @@
#include <boost/type_traits/is_convertible.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/mpl/if.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/named_function_params.hpp>
#include <algorithm>
Modified: trunk/boost/graph/biconnected_components.hpp
==============================================================================
--- trunk/boost/graph/biconnected_components.hpp (original)
+++ trunk/boost/graph/biconnected_components.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -17,7 +17,7 @@
#include <boost/limits.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/graph_concepts.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/depth_first_search.hpp>
#include <boost/graph/graph_utility.hpp>
Modified: trunk/boost/graph/chrobak_payne_drawing.hpp
==============================================================================
--- trunk/boost/graph/chrobak_payne_drawing.hpp (original)
+++ trunk/boost/graph/chrobak_payne_drawing.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -14,7 +14,7 @@
#include <boost/config.hpp>
#include <boost/utility.hpp> //for next and prior
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost
Modified: trunk/boost/graph/copy.hpp
==============================================================================
--- trunk/boost/graph/copy.hpp (original)
+++ trunk/boost/graph/copy.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -44,7 +44,7 @@
#include <boost/config.hpp>
#include <vector>
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/named_function_params.hpp>
#include <boost/graph/breadth_first_search.hpp>
#include <boost/type_traits/conversion_traits.hpp>
Modified: trunk/boost/graph/create_condensation_graph.hpp
==============================================================================
--- trunk/boost/graph/create_condensation_graph.hpp (original)
+++ trunk/boost/graph/create_condensation_graph.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -11,7 +11,7 @@
#define BOOST_CREATE_CONDENSATION_GRAPH_HPP
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost {
Modified: trunk/boost/graph/detail/adjacency_list.hpp
==============================================================================
--- trunk/boost/graph/detail/adjacency_list.hpp (original)
+++ trunk/boost/graph/detail/adjacency_list.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -15,7 +15,7 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/operators.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/pending/integer_range.hpp>
#include <boost/graph/graph_traits.hpp>
#include <memory>
Modified: trunk/boost/graph/detail/d_ary_heap.hpp
==============================================================================
--- trunk/boost/graph/detail/d_ary_heap.hpp (original)
+++ trunk/boost/graph/detail/d_ary_heap.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -18,7 +18,7 @@
#include <cassert>
#include <boost/static_assert.hpp>
#include <boost/shared_array.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost {
Modified: trunk/boost/graph/detail/read_graphviz_spirit.hpp
==============================================================================
--- trunk/boost/graph/detail/read_graphviz_spirit.hpp (original)
+++ trunk/boost/graph/detail/read_graphviz_spirit.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -43,7 +43,7 @@
#include <boost/ref.hpp>
#include <boost/function/function2.hpp>
#include <boost/type_traits/is_same.hpp>
-#include <boost/dynamic_property_map.hpp>
+#include <boost/property_map/dynamic_property_map.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/detail/workaround.hpp>
#include <algorithm>
Modified: trunk/boost/graph/detail/self_avoiding_walk.hpp
==============================================================================
--- trunk/boost/graph/detail/self_avoiding_walk.hpp (original)
+++ trunk/boost/graph/detail/self_avoiding_walk.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -29,7 +29,7 @@
#include <utility>
#include <boost/config.hpp>
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#define SAW_SENTINAL -1
Modified: trunk/boost/graph/detail/sparse_ordering.hpp
==============================================================================
--- trunk/boost/graph/detail/sparse_ordering.hpp (original)
+++ trunk/boost/graph/detail/sparse_ordering.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -20,7 +20,7 @@
#include <boost/graph/breadth_first_search.hpp>
#include <boost/graph/properties.hpp>
#include <boost/pending/indirect_cmp.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/bind.hpp>
#include <boost/graph/iteration_macros.hpp>
#include <boost/graph/depth_first_search.hpp>
Modified: trunk/boost/graph/dijkstra_shortest_paths.hpp
==============================================================================
--- trunk/boost/graph/dijkstra_shortest_paths.hpp (original)
+++ trunk/boost/graph/dijkstra_shortest_paths.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -27,8 +27,8 @@
#include <boost/smart_ptr.hpp>
#include <boost/graph/detail/d_ary_heap.hpp>
#include <boost/graph/two_bit_color_map.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <boost/type_traits.hpp>
#ifdef BOOST_GRAPH_DIJKSTRA_TESTING
Modified: trunk/boost/graph/edmonds_karp_max_flow.hpp
==============================================================================
--- trunk/boost/graph/edmonds_karp_max_flow.hpp (original)
+++ trunk/boost/graph/edmonds_karp_max_flow.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -15,7 +15,7 @@
#include <algorithm> // for std::min and std::max
#include <boost/config.hpp>
#include <boost/pending/queue.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/filtered_graph.hpp>
Modified: trunk/boost/graph/floyd_warshall_shortest.hpp
==============================================================================
--- trunk/boost/graph/floyd_warshall_shortest.hpp (original)
+++ trunk/boost/graph/floyd_warshall_shortest.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -29,7 +29,7 @@
#ifndef BOOST_GRAPH_FLOYD_WARSHALL_HPP
#define BOOST_GRAPH_FLOYD_WARSHALL_HPP
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/named_function_params.hpp>
#include <boost/graph/graph_concepts.hpp>
Modified: trunk/boost/graph/graph_archetypes.hpp
==============================================================================
--- trunk/boost/graph/graph_archetypes.hpp (original)
+++ trunk/boost/graph/graph_archetypes.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -10,7 +10,7 @@
#ifndef BOOST_GRAPH_ARCHETYPES_HPP
#define BOOST_GRAPH_ARCHETYPES_HPP
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/concept_archetype.hpp>
namespace boost { // should use a different namespace for this
Modified: trunk/boost/graph/graph_as_tree.hpp
==============================================================================
--- trunk/boost/graph/graph_as_tree.hpp (original)
+++ trunk/boost/graph/graph_as_tree.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -13,7 +13,7 @@
#include <vector>
#include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/tree_traits.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/breadth_first_search.hpp>
Modified: trunk/boost/graph/graph_concepts.hpp
==============================================================================
--- trunk/boost/graph/graph_concepts.hpp (original)
+++ trunk/boost/graph/graph_concepts.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -14,7 +14,7 @@
#define BOOST_GRAPH_CONCEPTS_HPP
#include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/numeric_values.hpp>
Modified: trunk/boost/graph/graphviz.hpp
==============================================================================
--- trunk/boost/graph/graphviz.hpp (original)
+++ trunk/boost/graph/graphviz.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -16,13 +16,13 @@
#include <iostream>
#include <fstream>
#include <stdio.h> // for FILE
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/subgraph.hpp>
#include <boost/graph/adjacency_list.hpp>
-#include <boost/dynamic_property_map.hpp>
+#include <boost/property_map/dynamic_property_map.hpp>
#include <boost/graph/overloading.hpp>
#ifdef BOOST_HAS_DECLSPEC
Modified: trunk/boost/graph/is_kuratowski_subgraph.hpp
==============================================================================
--- trunk/boost/graph/is_kuratowski_subgraph.hpp (original)
+++ trunk/boost/graph/is_kuratowski_subgraph.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -11,7 +11,7 @@
#include <boost/config.hpp>
#include <boost/utility.hpp> //for next/prior
#include <boost/tuple/tuple.hpp> //for tie
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/isomorphism.hpp>
#include <boost/graph/adjacency_list.hpp>
Modified: trunk/boost/graph/is_straight_line_drawing.hpp
==============================================================================
--- trunk/boost/graph/is_straight_line_drawing.hpp (original)
+++ trunk/boost/graph/is_straight_line_drawing.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -12,7 +12,7 @@
#include <boost/utility.hpp> //for next and prior
#include <boost/tuple/tuple.hpp>
#include <boost/tuple/tuple_comparison.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/planar_detail/bucket_sort.hpp>
Modified: trunk/boost/graph/johnson_all_pairs_shortest.hpp
==============================================================================
--- trunk/boost/graph/johnson_all_pairs_shortest.hpp (original)
+++ trunk/boost/graph/johnson_all_pairs_shortest.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -23,7 +23,7 @@
#define BOOST_GRAPH_JOHNSON_HPP
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/bellman_ford_shortest_paths.hpp>
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/graph/adjacency_list.hpp>
Modified: trunk/boost/graph/kolmogorov_max_flow.hpp
==============================================================================
--- trunk/boost/graph/kolmogorov_max_flow.hpp (original)
+++ trunk/boost/graph/kolmogorov_max_flow.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -42,7 +42,7 @@
#include <boost/pending/queue.hpp>
#include <boost/limits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/none_t.hpp>
#include <boost/graph/graph_concepts.hpp>
#include <boost/graph/named_function_params.hpp>
Modified: trunk/boost/graph/kruskal_min_spanning_tree.hpp
==============================================================================
--- trunk/boost/graph/kruskal_min_spanning_tree.hpp (original)
+++ trunk/boost/graph/kruskal_min_spanning_tree.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -23,7 +23,7 @@
#include <queue>
#include <functional>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_concepts.hpp>
#include <boost/graph/named_function_params.hpp>
#include <boost/pending/disjoint_sets.hpp>
Modified: trunk/boost/graph/make_biconnected_planar.hpp
==============================================================================
--- trunk/boost/graph/make_biconnected_planar.hpp (original)
+++ trunk/boost/graph/make_biconnected_planar.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -11,7 +11,7 @@
#include <boost/config.hpp>
#include <boost/tuple/tuple.hpp> //for tie
#include <boost/graph/biconnected_components.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <vector>
#include <iterator>
#include <algorithm>
Modified: trunk/boost/graph/make_connected.hpp
==============================================================================
--- trunk/boost/graph/make_connected.hpp (original)
+++ trunk/boost/graph/make_connected.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -12,7 +12,7 @@
#include <boost/utility.hpp> //for next
#include <boost/tuple/tuple.hpp> //for tie
#include <boost/graph/connected_components.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <vector>
#include <boost/graph/planar_detail/add_edge_visitors.hpp>
Modified: trunk/boost/graph/make_maximal_planar.hpp
==============================================================================
--- trunk/boost/graph/make_maximal_planar.hpp (original)
+++ trunk/boost/graph/make_maximal_planar.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -11,7 +11,7 @@
#include <boost/config.hpp>
#include <boost/tuple/tuple.hpp> //for tie
#include <boost/graph/biconnected_components.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <vector>
#include <iterator>
#include <algorithm>
Modified: trunk/boost/graph/max_cardinality_matching.hpp
==============================================================================
--- trunk/boost/graph/max_cardinality_matching.hpp (original)
+++ trunk/boost/graph/max_cardinality_matching.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -15,7 +15,7 @@
#include <deque>
#include <algorithm> // for std::sort and std::stable_sort
#include <utility> // for std::pair
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/utility.hpp> // for boost::tie
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/visitors.hpp>
Modified: trunk/boost/graph/minimum_degree_ordering.hpp
==============================================================================
--- trunk/boost/graph/minimum_degree_ordering.hpp (original)
+++ trunk/boost/graph/minimum_degree_ordering.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -17,7 +17,7 @@
#include <boost/pending/bucket_sorter.hpp>
#include <boost/detail/numeric_traits.hpp> // for integer_traits
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost {
Modified: trunk/boost/graph/page_rank.hpp
==============================================================================
--- trunk/boost/graph/page_rank.hpp (original)
+++ trunk/boost/graph/page_rank.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -11,7 +11,7 @@
#ifndef BOOST_GRAPH_PAGE_RANK_HPP
#define BOOST_GRAPH_PAGE_RANK_HPP
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/iteration_macros.hpp>
Modified: trunk/boost/graph/planar_canonical_ordering.hpp
==============================================================================
--- trunk/boost/graph/planar_canonical_ordering.hpp (original)
+++ trunk/boost/graph/planar_canonical_ordering.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -14,7 +14,7 @@
#include <boost/config.hpp>
#include <boost/utility.hpp> //for next and prior
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost
Modified: trunk/boost/graph/planar_detail/add_edge_visitors.hpp
==============================================================================
--- trunk/boost/graph/planar_detail/add_edge_visitors.hpp (original)
+++ trunk/boost/graph/planar_detail/add_edge_visitors.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -8,7 +8,7 @@
#ifndef __ADD_EDGE_VISITORS_HPP__
#define __ADD_EDGE_VISITORS_HPP__
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost
{
Modified: trunk/boost/graph/planar_detail/boyer_myrvold_impl.hpp
==============================================================================
--- trunk/boost/graph/planar_detail/boyer_myrvold_impl.hpp (original)
+++ trunk/boost/graph/planar_detail/boyer_myrvold_impl.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -14,7 +14,7 @@
#include <boost/config.hpp> //for std::min macros
#include <boost/shared_ptr.hpp>
#include <boost/tuple/tuple.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/depth_first_search.hpp>
#include <boost/graph/planar_detail/face_handles.hpp>
Modified: trunk/boost/graph/planar_detail/bucket_sort.hpp
==============================================================================
--- trunk/boost/graph/planar_detail/bucket_sort.hpp (original)
+++ trunk/boost/graph/planar_detail/bucket_sort.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -10,7 +10,7 @@
#include <vector>
#include <algorithm>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
Modified: trunk/boost/graph/properties.hpp
==============================================================================
--- trunk/boost/graph/properties.hpp (original)
+++ trunk/boost/graph/properties.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -12,7 +12,7 @@
#include <boost/config.hpp>
#include <cassert>
#include <boost/pending/property.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/type_traits/is_convertible.hpp>
#include <boost/limits.hpp>
@@ -285,7 +285,7 @@
//========================================================================
// Iterator Property Map Generating Functions contributed by
// Kevin Vanhorn. (see also the property map generating functions
- // in boost/property_map.hpp)
+ // in boost/property_map/property_map.hpp)
#if !defined(BOOST_NO_STD_ITERATOR_TRAITS)
// A helper function for creating a vertex property map out of a
Modified: trunk/boost/graph/property_iter_range.hpp
==============================================================================
--- trunk/boost/graph/property_iter_range.hpp (original)
+++ trunk/boost/graph/property_iter_range.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -18,7 +18,7 @@
#ifndef BOOST_GRAPH_PROPERTY_ITER_RANGE_HPP
#define BOOST_GRAPH_PROPERTY_ITER_RANGE_HPP
-#include <boost/property_map_iterator.hpp>
+#include <boost/property_map/property_map_iterator.hpp>
#include <boost/graph/properties.hpp>
#include <boost/mpl/if.hpp>
#include <boost/type_traits/same_traits.hpp>
Modified: trunk/boost/graph/property_maps/constant_property_map.hpp
==============================================================================
--- trunk/boost/graph/property_maps/constant_property_map.hpp (original)
+++ trunk/boost/graph/property_maps/constant_property_map.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -7,7 +7,7 @@
#ifndef BOOST_GRAPH_CONSTANT_PROPERTY_HPP
#define BOOST_GRAPH_CONSTANT_PROPERTY_HPP
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
// TODO: This should really be part of the property maps library rather than
Modified: trunk/boost/graph/property_maps/container_property_map.hpp
==============================================================================
--- trunk/boost/graph/property_maps/container_property_map.hpp (original)
+++ trunk/boost/graph/property_maps/container_property_map.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -8,7 +8,7 @@
#define BOOST_GRAPH_CONTAINER_PROPERTY_MAP_HPP
#include <boost/graph/detail/index.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost
{
Modified: trunk/boost/graph/relax.hpp
==============================================================================
--- trunk/boost/graph/relax.hpp (original)
+++ trunk/boost/graph/relax.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -12,7 +12,7 @@
#include <functional>
#include <boost/limits.hpp> // for numeric limits
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost {
Modified: trunk/boost/graph/sequential_vertex_coloring.hpp
==============================================================================
--- trunk/boost/graph/sequential_vertex_coloring.hpp (original)
+++ trunk/boost/graph/sequential_vertex_coloring.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -13,7 +13,7 @@
#include <vector>
#include <boost/graph/graph_traits.hpp>
#include <boost/tuple/tuple.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/limits.hpp>
#ifdef BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
Modified: trunk/boost/graph/sloan_ordering.hpp
==============================================================================
--- trunk/boost/graph/sloan_ordering.hpp (original)
+++ trunk/boost/graph/sloan_ordering.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -25,7 +25,7 @@
#include <boost/graph/breadth_first_search.hpp>
#include <boost/graph/properties.hpp>
#include <boost/pending/indirect_cmp.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/visitors.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/cuthill_mckee_ordering.hpp>
Modified: trunk/boost/graph/stanford_graph.hpp
==============================================================================
--- trunk/boost/graph/stanford_graph.hpp (original)
+++ trunk/boost/graph/stanford_graph.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -12,7 +12,7 @@
#include <boost/config.hpp>
#include <boost/iterator.hpp>
#include <boost/operators.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/properties.hpp>
Modified: trunk/boost/graph/topological_sort.hpp
==============================================================================
--- trunk/boost/graph/topological_sort.hpp (original)
+++ trunk/boost/graph/topological_sort.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -12,7 +12,7 @@
#define BOOST_GRAPH_TOPOLOGICAL_SORT_HPP
#include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/depth_first_search.hpp>
#include <boost/graph/visitors.hpp>
#include <boost/graph/exception.hpp>
Modified: trunk/boost/graph/two_bit_color_map.hpp
==============================================================================
--- trunk/boost/graph/two_bit_color_map.hpp (original)
+++ trunk/boost/graph/two_bit_color_map.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -13,7 +13,7 @@
#ifndef BOOST_TWO_BIT_COLOR_MAP_HPP
#define BOOST_TWO_BIT_COLOR_MAP_HPP
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/shared_array.hpp>
#include <algorithm>
Modified: trunk/boost/graph/vector_as_graph.hpp
==============================================================================
--- trunk/boost/graph/vector_as_graph.hpp (original)
+++ trunk/boost/graph/vector_as_graph.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -21,7 +21,7 @@
#include <boost/iterator.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/pending/integer_range.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/properties.hpp>
#include <algorithm>
Modified: trunk/boost/graph/visitors.hpp
==============================================================================
--- trunk/boost/graph/visitors.hpp (original)
+++ trunk/boost/graph/visitors.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -15,7 +15,7 @@
#include <iosfwd>
#include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/limits.hpp>
#include <boost/graph/detail/is_same.hpp>
Modified: trunk/boost/mpi/graph_communicator.hpp
==============================================================================
--- trunk/boost/mpi/graph_communicator.hpp (original)
+++ trunk/boost/mpi/graph_communicator.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -28,7 +28,7 @@
// Headers required to implement graph topologies
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/properties.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/iterator/counting_iterator.hpp>
#include <boost/graph/iteration_macros.hpp>
#include <boost/shared_array.hpp>
Modified: trunk/boost/pending/fibonacci_heap.hpp
==============================================================================
--- trunk/boost/pending/fibonacci_heap.hpp (original)
+++ trunk/boost/pending/fibonacci_heap.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -14,7 +14,7 @@
#include <vector>
#include <functional>
#include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
//
// An adaptation of Knuth's Fibonacci heap implementation
Modified: trunk/boost/pending/indirect_cmp.hpp
==============================================================================
--- trunk/boost/pending/indirect_cmp.hpp (original)
+++ trunk/boost/pending/indirect_cmp.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -14,7 +14,7 @@
#include <functional>
#include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost {
Modified: trunk/boost/pending/mutable_queue.hpp
==============================================================================
--- trunk/boost/pending/mutable_queue.hpp (original)
+++ trunk/boost/pending/mutable_queue.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -14,7 +14,7 @@
#include <vector>
#include <algorithm>
#include <functional>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/pending/mutable_heap.hpp>
#include <boost/pending/is_heap.hpp>
#include <boost/graph/detail/array_binary_tree.hpp>
Modified: trunk/boost/pending/relaxed_heap.hpp
==============================================================================
--- trunk/boost/pending/relaxed_heap.hpp (original)
+++ trunk/boost/pending/relaxed_heap.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -10,7 +10,7 @@
#define BOOST_RELAXED_HEAP_HEADER
#include <functional>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/optional.hpp>
#include <vector>
#include <climits> // for CHAR_BIT
Modified: trunk/boost/property_map.hpp
==============================================================================
--- trunk/boost/property_map.hpp (original)
+++ trunk/boost/property_map.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -1,591 +1,17 @@
-// (C) Copyright Jeremy Siek 1999-2001.
-// Copyright (C) 2006 Trustees of Indiana University
-// Authors: Douglas Gregor and Jeremy Siek
+/*=============================================================================
+Copyright (c) 2009 Trustees of Indiana University
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// See http://www.boost.org/libs/property_map for documentation.
-
-#ifndef BOOST_PROPERTY_MAP_HPP
-#define BOOST_PROPERTY_MAP_HPP
-
-#include <cassert>
-#include <boost/config.hpp>
-#include <boost/pending/cstddef.hpp>
-#include <boost/detail/iterator.hpp>
-#include <boost/concept_check.hpp>
-#include <boost/concept_archetype.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-namespace boost {
-
- //=========================================================================
- // property_traits class
-
- template <typename PA>
- struct property_traits {
- typedef typename PA::key_type key_type;
- typedef typename PA::value_type value_type;
- typedef typename PA::reference reference;
- typedef typename PA::category category;
- };
-
- //=========================================================================
- // property_traits category tags
-
- namespace detail {
- enum ePropertyMapID { READABLE_PA, WRITABLE_PA,
- READ_WRITE_PA, LVALUE_PA, OP_BRACKET_PA,
- RAND_ACCESS_ITER_PA, LAST_PA };
- }
- struct readable_property_map_tag { enum { id = detail::READABLE_PA }; };
- struct writable_property_map_tag { enum { id = detail::WRITABLE_PA }; };
- struct read_write_property_map_tag :
- public readable_property_map_tag,
- public writable_property_map_tag
- { enum { id = detail::READ_WRITE_PA }; };
-
- struct lvalue_property_map_tag : public read_write_property_map_tag
- { enum { id = detail::LVALUE_PA }; };
-
- //=========================================================================
- // property_traits specialization for pointers
-
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
- // The user will just have to create their own specializations for
- // other pointers types if the compiler does not have partial
- // specializations. Sorry!
-#define BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(TYPE) \
- template <> \
- struct property_traits<TYPE*> { \
- typedef TYPE value_type; \
- typedef value_type& reference; \
- typedef std::ptrdiff_t key_type; \
- typedef lvalue_property_map_tag category; \
- }; \
- template <> \
- struct property_traits<const TYPE*> { \
- typedef TYPE value_type; \
- typedef const value_type& reference; \
- typedef std::ptrdiff_t key_type; \
- typedef lvalue_property_map_tag category; \
- }
-
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(long);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(unsigned long);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(int);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(unsigned int);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(short);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(unsigned short);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(char);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(unsigned char);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(signed char);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(bool);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(float);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(double);
- BOOST_SPECIALIZE_PROPERTY_TRAITS_PTR(long double);
-
- // This may need to be turned off for some older compilers that don't have
- // wchar_t intrinsically.
-# ifndef BOOST_NO_INTRINSIC_WCHAR_T
- template <>
- struct property_traits<wchar_t*> {
- typedef wchar_t value_type;
- typedef value_type& reference;
- typedef std::ptrdiff_t key_type;
- typedef lvalue_property_map_tag category;
- };
- template <>
- struct property_traits<const wchar_t*> {
- typedef wchar_t value_type;
- typedef const value_type& reference;
- typedef std::ptrdiff_t key_type;
- typedef lvalue_property_map_tag category;
- };
-# endif
-
-#else
- template <class T>
- struct property_traits<T*> {
- typedef T value_type;
- typedef value_type& reference;
- typedef std::ptrdiff_t key_type;
- typedef lvalue_property_map_tag category;
- };
- template <class T>
- struct property_traits<const T*> {
- typedef T value_type;
- typedef const value_type& reference;
- typedef std::ptrdiff_t key_type;
- typedef lvalue_property_map_tag category;
- };
-#endif
-
-#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
- // MSVC doesn't have Koenig lookup, so the user has to
- // do boost::get() anyways, and the using clause
- // doesn't really work for MSVC.
-} // namespace boost
-#endif
-
- // These need to go in global namespace because Koenig
- // lookup does not apply to T*.
-
- // V must be convertible to T
- template <class T, class V>
- inline void put(T* pa, std::ptrdiff_t k, const V& val) { pa[k] = val; }
-
- template <class T>
- inline const T& get(const T* pa, std::ptrdiff_t k) { return pa[k]; }
-
-#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
-namespace boost {
- using ::put;
- using ::get;
-#endif
-
- //=========================================================================
- // concept checks for property maps
-
- template <class PMap, class Key>
- struct ReadablePropertyMapConcept
- {
- typedef typename property_traits<PMap>::key_type key_type;
- typedef typename property_traits<PMap>::reference reference;
- typedef typename property_traits<PMap>::category Category;
- typedef boost::readable_property_map_tag ReadableTag;
- void constraints() {
- function_requires< ConvertibleConcept<Category, ReadableTag> >();
-
- val = get(pmap, k);
- }
- PMap pmap;
- Key k;
- typename property_traits<PMap>::value_type val;
- };
- template <typename KeyArchetype, typename ValueArchetype>
- struct readable_property_map_archetype {
- typedef KeyArchetype key_type;
- typedef ValueArchetype value_type;
- typedef convertible_to_archetype<ValueArchetype> reference;
- typedef readable_property_map_tag category;
- };
- template <typename K, typename V>
- const typename readable_property_map_archetype<K,V>::reference&
- get(const readable_property_map_archetype<K,V>&,
- const typename readable_property_map_archetype<K,V>::key_type&)
- {
- typedef typename readable_property_map_archetype<K,V>::reference R;
- return static_object<R>::get();
- }
-
-
- template <class PMap, class Key>
- struct WritablePropertyMapConcept
- {
- typedef typename property_traits<PMap>::key_type key_type;
- typedef typename property_traits<PMap>::category Category;
- typedef boost::writable_property_map_tag WritableTag;
- void constraints() {
- function_requires< ConvertibleConcept<Category, WritableTag> >();
- put(pmap, k, val);
- }
- PMap pmap;
- Key k;
- typename property_traits<PMap>::value_type val;
- };
- template <typename KeyArchetype, typename ValueArchetype>
- struct writable_property_map_archetype {
- typedef KeyArchetype key_type;
- typedef ValueArchetype value_type;
- typedef void reference;
- typedef writable_property_map_tag category;
- };
- template <typename K, typename V>
- void put(const writable_property_map_archetype<K,V>&,
- const typename writable_property_map_archetype<K,V>::key_type&,
- const typename writable_property_map_archetype<K,V>::value_type&) { }
-
-
- template <class PMap, class Key>
- struct ReadWritePropertyMapConcept
- {
- typedef typename property_traits<PMap>::category Category;
- typedef boost::read_write_property_map_tag ReadWriteTag;
- void constraints() {
- function_requires< ReadablePropertyMapConcept<PMap, Key> >();
- function_requires< WritablePropertyMapConcept<PMap, Key> >();
- function_requires< ConvertibleConcept<Category, ReadWriteTag> >();
- }
- };
- template <typename KeyArchetype, typename ValueArchetype>
- struct read_write_property_map_archetype
- : public readable_property_map_archetype<KeyArchetype, ValueArchetype>,
- public writable_property_map_archetype<KeyArchetype, ValueArchetype>
- {
- typedef KeyArchetype key_type;
- typedef ValueArchetype value_type;
- typedef convertible_to_archetype<ValueArchetype> reference;
- typedef read_write_property_map_tag category;
- };
-
-
- template <class PMap, class Key>
- struct LvaluePropertyMapConcept
- {
- typedef typename property_traits<PMap>::category Category;
- typedef boost::lvalue_property_map_tag LvalueTag;
- typedef typename property_traits<PMap>::reference reference;
-
- void constraints() {
- function_requires< ReadablePropertyMapConcept<PMap, Key> >();
- function_requires< ConvertibleConcept<Category, LvalueTag> >();
-
- typedef typename property_traits<PMap>::value_type value_type;
- BOOST_MPL_ASSERT((boost::mpl::or_<
- boost::is_same<const value_type&, reference>,
- boost::is_same<value_type&, reference> >));
-
- reference ref = pmap[k];
- ignore_unused_variable_warning(ref);
- }
- PMap pmap;
- Key k;
- };
- template <typename KeyArchetype, typename ValueArchetype>
- struct lvalue_property_map_archetype
- : public readable_property_map_archetype<KeyArchetype, ValueArchetype>
- {
- typedef KeyArchetype key_type;
- typedef ValueArchetype value_type;
- typedef const ValueArchetype& reference;
- typedef lvalue_property_map_tag category;
- const value_type& operator[](const key_type&) const {
- return static_object<value_type>::get();
- }
- };
-
- template <class PMap, class Key>
- struct Mutable_LvaluePropertyMapConcept
- {
- typedef typename property_traits<PMap>::category Category;
- typedef boost::lvalue_property_map_tag LvalueTag;
- typedef typename property_traits<PMap>::reference reference;
- void constraints() {
- boost::function_requires< ReadWritePropertyMapConcept<PMap, Key> >();
- boost::function_requires<ConvertibleConcept<Category, LvalueTag> >();
-
- typedef typename property_traits<PMap>::value_type value_type;
- BOOST_MPL_ASSERT((boost::is_same<value_type&, reference>));
-
- reference ref = pmap[k];
- ignore_unused_variable_warning(ref);
- }
- PMap pmap;
- Key k;
- };
- template <typename KeyArchetype, typename ValueArchetype>
- struct mutable_lvalue_property_map_archetype
- : public readable_property_map_archetype<KeyArchetype, ValueArchetype>,
- public writable_property_map_archetype<KeyArchetype, ValueArchetype>
- {
- typedef KeyArchetype key_type;
- typedef ValueArchetype value_type;
- typedef ValueArchetype& reference;
- typedef lvalue_property_map_tag category;
- value_type& operator[](const key_type&) const {
- return static_object<value_type>::get();
- }
- };
-
- struct identity_property_map;
-
- // A helper class for constructing a property map
- // from a class that implements operator[]
-
- template <class Reference, class LvaluePropertyMap>
- struct put_get_helper { };
-
- template <class PropertyMap, class Reference, class K>
- inline Reference
- get(const put_get_helper<Reference, PropertyMap>& pa, const K& k)
- {
- Reference v = static_cast<const PropertyMap&>(pa)[k];
- return v;
- }
- template <class PropertyMap, class Reference, class K, class V>
- inline void
- put(const put_get_helper<Reference, PropertyMap>& pa, K k, const V& v)
- {
- static_cast<const PropertyMap&>(pa)[k] = v;
- }
-
- //=========================================================================
- // Adapter to turn a RandomAccessIterator into a property map
-
- template <class RandomAccessIterator,
- class IndexMap
-#ifdef BOOST_NO_STD_ITERATOR_TRAITS
- , class T, class R
-#else
- , class T = typename std::iterator_traits<RandomAccessIterator>::value_type
- , class R = typename std::iterator_traits<RandomAccessIterator>::reference
-#endif
- >
- class iterator_property_map
- : public boost::put_get_helper< R,
- iterator_property_map<RandomAccessIterator, IndexMap,
- T, R> >
- {
- public:
- typedef typename property_traits<IndexMap>::key_type key_type;
- typedef T value_type;
- typedef R reference;
- typedef boost::lvalue_property_map_tag category;
-
- inline iterator_property_map(
- RandomAccessIterator cc = RandomAccessIterator(),
- const IndexMap& _id = IndexMap() )
- : iter(cc), index(_id) { }
- inline R operator[](key_type v) const { return *(iter + get(index, v)) ; }
- protected:
- RandomAccessIterator iter;
- IndexMap index;
- };
-
-#if !defined BOOST_NO_STD_ITERATOR_TRAITS
- template <class RAIter, class ID>
- inline iterator_property_map<
- RAIter, ID,
- typename std::iterator_traits<RAIter>::value_type,
- typename std::iterator_traits<RAIter>::reference>
- make_iterator_property_map(RAIter iter, ID id) {
- function_requires< RandomAccessIteratorConcept<RAIter> >();
- typedef iterator_property_map<
- RAIter, ID,
- typename std::iterator_traits<RAIter>::value_type,
- typename std::iterator_traits<RAIter>::reference> PA;
- return PA(iter, id);
- }
-#endif
- template <class RAIter, class Value, class ID>
- inline iterator_property_map<RAIter, ID, Value, Value&>
- make_iterator_property_map(RAIter iter, ID id, Value) {
- function_requires< RandomAccessIteratorConcept<RAIter> >();
- typedef iterator_property_map<RAIter, ID, Value, Value&> PMap;
- return PMap(iter, id);
- }
-
- template <class RandomAccessIterator,
- class IndexMap
-#ifdef BOOST_NO_STD_ITERATOR_TRAITS
- , class T, class R
-#else
- , class T = typename std::iterator_traits<RandomAccessIterator>::value_type
- , class R = typename std::iterator_traits<RandomAccessIterator>::reference
+Distributed under the Boost Software License, Version 1.0. (See accompanying
+file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+// Redirect/warning header, adapted from the version in Spirit
+
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+# pragma message ("Warning: This header is deprecated. Please use: boost/property_map/property_map.hpp")
+#elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
+# warning "This header is deprecated. Please use: boost/property_map/property_map.hpp"
#endif
- >
- class safe_iterator_property_map
- : public boost::put_get_helper< R,
- safe_iterator_property_map<RandomAccessIterator, IndexMap,
- T, R> >
- {
- public:
- typedef typename property_traits<IndexMap>::key_type key_type;
- typedef T value_type;
- typedef R reference;
- typedef boost::lvalue_property_map_tag category;
-
- inline safe_iterator_property_map(
- RandomAccessIterator first,
- std::size_t n_ = 0,
- const IndexMap& _id = IndexMap() )
- : iter(first), n(n_), index(_id) { }
- inline safe_iterator_property_map() { }
- inline R operator[](key_type v) const {
- assert(get(index, v) < n);
- return *(iter + get(index, v)) ;
- }
- typename property_traits<IndexMap>::value_type size() const { return n; }
- protected:
- RandomAccessIterator iter;
- typename property_traits<IndexMap>::value_type n;
- IndexMap index;
- };
-
-#if !defined BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
- template <class RAIter, class ID>
- inline safe_iterator_property_map<
- RAIter, ID,
- typename boost::detail::iterator_traits<RAIter>::value_type,
- typename boost::detail::iterator_traits<RAIter>::reference>
- make_safe_iterator_property_map(RAIter iter, std::size_t n, ID id) {
- function_requires< RandomAccessIteratorConcept<RAIter> >();
- typedef safe_iterator_property_map<
- RAIter, ID,
- typename boost::detail::iterator_traits<RAIter>::value_type,
- typename boost::detail::iterator_traits<RAIter>::reference> PA;
- return PA(iter, n, id);
- }
#endif
- template <class RAIter, class Value, class ID>
- inline safe_iterator_property_map<RAIter, ID, Value, Value&>
- make_safe_iterator_property_map(RAIter iter, std::size_t n, ID id, Value) {
- function_requires< RandomAccessIteratorConcept<RAIter> >();
- typedef safe_iterator_property_map<RAIter, ID, Value, Value&> PMap;
- return PMap(iter, n, id);
- }
-
- //=========================================================================
- // An adaptor to turn a Unique Pair Associative Container like std::map or
- // std::hash_map into an Lvalue Property Map.
-
- template <typename UniquePairAssociativeContainer>
- class associative_property_map
- : public boost::put_get_helper<
- typename UniquePairAssociativeContainer::value_type::second_type&,
- associative_property_map<UniquePairAssociativeContainer> >
- {
- typedef UniquePairAssociativeContainer C;
- public:
- typedef typename C::key_type key_type;
- typedef typename C::value_type::second_type value_type;
- typedef value_type& reference;
- typedef lvalue_property_map_tag category;
- associative_property_map() : m_c(0) { }
- associative_property_map(C& c) : m_c(&c) { }
- reference operator[](const key_type& k) const {
- return (*m_c)[k];
- }
- private:
- C* m_c;
- };
-
- template <class UniquePairAssociativeContainer>
- associative_property_map<UniquePairAssociativeContainer>
- make_assoc_property_map(UniquePairAssociativeContainer& c)
- {
- return associative_property_map<UniquePairAssociativeContainer>(c);
- }
-
- template <typename UniquePairAssociativeContainer>
- class const_associative_property_map
- : public boost::put_get_helper<
- const typename UniquePairAssociativeContainer::value_type::second_type&,
- const_associative_property_map<UniquePairAssociativeContainer> >
- {
- typedef UniquePairAssociativeContainer C;
- public:
- typedef typename C::key_type key_type;
- typedef typename C::value_type::second_type value_type;
- typedef const value_type& reference;
- typedef lvalue_property_map_tag category;
- const_associative_property_map() : m_c(0) { }
- const_associative_property_map(const C& c) : m_c(&c) { }
- reference operator[](const key_type& k) const {
- return m_c->find(k)->second;
- }
- private:
- C const* m_c;
- };
-
- template <class UniquePairAssociativeContainer>
- const_associative_property_map<UniquePairAssociativeContainer>
- make_assoc_property_map(const UniquePairAssociativeContainer& c)
- {
- return const_associative_property_map<UniquePairAssociativeContainer>(c);
- }
-
- //=========================================================================
- // A property map that always returns the same object by value.
- //
- template <typename ValueType>
- class static_property_map :
- public
- boost::put_get_helper<ValueType,static_property_map<ValueType> >
- {
- ValueType value;
- public:
- typedef void key_type;
- typedef ValueType value_type;
- typedef ValueType reference;
- typedef readable_property_map_tag category;
- static_property_map(ValueType v) : value(v) {}
-
- template<typename T>
- inline reference operator[](T) const { return value; }
- };
-
- //=========================================================================
- // A property map that always returns a reference to the same object.
- //
- template <typename KeyType, typename ValueType>
- class ref_property_map :
- public
- boost::put_get_helper<ValueType&,ref_property_map<KeyType,ValueType> >
- {
- ValueType* value;
- public:
- typedef KeyType key_type;
- typedef ValueType value_type;
- typedef ValueType& reference;
- typedef lvalue_property_map_tag category;
- ref_property_map(ValueType& v) : value(&v) {}
- ValueType& operator[](key_type const&) const { return *value; }
- };
-
- //=========================================================================
- // A property map that applies the identity function to integers
- struct identity_property_map
- : public boost::put_get_helper<std::size_t,
- identity_property_map>
- {
- typedef std::size_t key_type;
- typedef std::size_t value_type;
- typedef std::size_t reference;
- typedef boost::readable_property_map_tag category;
-
- inline value_type operator[](const key_type& v) const { return v; }
- };
-
- //=========================================================================
- // A property map that does not do anything, for
- // when you have to supply a property map, but don't need it.
- namespace detail {
- struct dummy_pmap_reference {
- template <class T>
- dummy_pmap_reference& operator=(const T&) { return *this; }
- operator int() { return 0; }
- };
- }
- class dummy_property_map
- : public boost::put_get_helper<detail::dummy_pmap_reference,
- dummy_property_map >
- {
- public:
- typedef void key_type;
- typedef int value_type;
- typedef detail::dummy_pmap_reference reference;
- typedef boost::read_write_property_map_tag category;
- inline dummy_property_map() : c(0) { }
- inline dummy_property_map(value_type cc) : c(cc) { }
- inline dummy_property_map(const dummy_property_map& x)
- : c(x.c) { }
- template <class Vertex>
- inline reference operator[](Vertex) const { return reference(); }
- protected:
- value_type c;
- };
-
-
-} // namespace boost
-
-
-#include <boost/vector_property_map.hpp>
-
-#endif /* BOOST_PROPERTY_MAP_HPP */
-
Copied: trunk/boost/property_map/dynamic_property_map.hpp (from r52225, /trunk/boost/dynamic_property_map.hpp)
==============================================================================
--- /trunk/boost/dynamic_property_map.hpp (original)
+++ trunk/boost/property_map/dynamic_property_map.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -18,7 +18,7 @@
#include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/any.hpp>
#include <boost/function/function3.hpp>
Copied: trunk/boost/property_map/property_map.hpp (from r52225, /trunk/boost/property_map.hpp)
==============================================================================
--- /trunk/boost/property_map.hpp (original)
+++ trunk/boost/property_map/property_map.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -585,7 +585,7 @@
} // namespace boost
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#endif /* BOOST_PROPERTY_MAP_HPP */
Copied: trunk/boost/property_map/property_map_iterator.hpp (from r52225, /trunk/boost/property_map_iterator.hpp)
==============================================================================
--- /trunk/boost/property_map_iterator.hpp (original)
+++ trunk/boost/property_map/property_map_iterator.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -8,7 +8,7 @@
#ifndef BOOST_PROPERTY_MAP_ITERATOR_HPP
#define BOOST_PROPERTY_MAP_ITERATOR_HPP
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/mpl/if.hpp>
#include <boost/type_traits/is_same.hpp>
Copied: trunk/boost/property_map/vector_property_map.hpp (from r52225, /trunk/boost/vector_property_map.hpp)
==============================================================================
--- /trunk/boost/vector_property_map.hpp (original)
+++ trunk/boost/property_map/vector_property_map.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -10,7 +10,7 @@
#ifndef VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04
#define VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/shared_ptr.hpp>
#include <vector>
Modified: trunk/boost/property_map_iterator.hpp
==============================================================================
--- trunk/boost/property_map_iterator.hpp (original)
+++ trunk/boost/property_map_iterator.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -1,113 +1,17 @@
-// (C) Copyright Jeremy Siek, 2001.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// See http://www.boost.org/libs/property_map for documentation.
-
-#ifndef BOOST_PROPERTY_MAP_ITERATOR_HPP
-#define BOOST_PROPERTY_MAP_ITERATOR_HPP
-
-#include <boost/property_map.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-namespace boost {
-
- //======================================================================
- // property iterator, generalized from ideas by François Faure
-
- namespace detail {
-
- template <class Iterator, class LvaluePropertyMap>
- class lvalue_pmap_iter
- : public iterator_adaptor< lvalue_pmap_iter< Iterator, LvaluePropertyMap >,
- Iterator,
- typename property_traits<LvaluePropertyMap>::value_type,
- use_default,
- typename property_traits<LvaluePropertyMap>::reference>
- {
- friend class boost::iterator_core_access;
-
- typedef iterator_adaptor< lvalue_pmap_iter< Iterator, LvaluePropertyMap >,
- Iterator,
- typename property_traits<LvaluePropertyMap>::value_type,
- use_default,
- typename property_traits<LvaluePropertyMap>::reference> super_t;
-
- public:
- lvalue_pmap_iter() { }
- lvalue_pmap_iter(Iterator const& it,
- LvaluePropertyMap m)
- : super_t(it),
- m_map(m) {}
-
- private:
- typename super_t::reference
- dereference() const
- {
- return m_map[*(this->base_reference())];
- }
-
- LvaluePropertyMap m_map;
- };
-
- template <class Iterator, class ReadablePropertyMap>
- class readable_pmap_iter :
- public iterator_adaptor< readable_pmap_iter< Iterator, ReadablePropertyMap >,
- Iterator,
- typename property_traits<ReadablePropertyMap>::value_type,
- use_default,
- typename property_traits<ReadablePropertyMap>::value_type>
-
-
- {
- friend class boost::iterator_core_access;
-
- typedef iterator_adaptor< readable_pmap_iter< Iterator, ReadablePropertyMap >,
- Iterator,
- typename property_traits<ReadablePropertyMap>::value_type,
- use_default,
- typename property_traits<ReadablePropertyMap>::value_type> super_t;
-
- public:
- readable_pmap_iter() { }
- readable_pmap_iter(Iterator const& it,
- ReadablePropertyMap m)
- : super_t(it),
- m_map(m) {}
-
- private:
- typename super_t::reference
- dereference() const
- {
- return get(m_map, *(this->base_reference()));
- }
-
- ReadablePropertyMap m_map;
- };
-
-
- } // namespace detail
-
- template <class PropertyMap, class Iterator>
- struct property_map_iterator_generator :
- mpl::if_< is_same< typename property_traits<PropertyMap>::category, lvalue_property_map_tag>,
- detail::lvalue_pmap_iter<Iterator, PropertyMap>,
- detail::readable_pmap_iter<Iterator, PropertyMap> >
- {};
-
- template <class PropertyMap, class Iterator>
- typename property_map_iterator_generator<PropertyMap, Iterator>::type
- make_property_map_iterator(PropertyMap pmap, Iterator iter)
- {
- typedef typename property_map_iterator_generator<PropertyMap,
- Iterator>::type Iter;
- return Iter(iter, pmap);
- }
-
-} // namespace boost
-
-#endif // BOOST_PROPERTY_MAP_ITERATOR_HPP
+/*=============================================================================
+Copyright (c) 2009 Trustees of Indiana University
+Distributed under the Boost Software License, Version 1.0. (See accompanying
+file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+// Redirect/warning header, adapted from the version in Spirit
+
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+# pragma message ("Warning: This header is deprecated. Please use: boost/property_map/property_map_iterator.hpp")
+#elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
+# warning "This header is deprecated. Please use: boost/property_map/property_map_iterator.hpp"
+#endif
+#endif
Modified: trunk/boost/vector_property_map.hpp
==============================================================================
--- trunk/boost/vector_property_map.hpp (original)
+++ trunk/boost/vector_property_map.hpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -1,95 +1,17 @@
-// Copyright (C) Vladimir Prus 2003.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/graph/vector_property_map.html for
-// documentation.
-//
-
-#ifndef VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04
-#define VECTOR_PROPERTY_MAP_HPP_VP_2003_03_04
-
-#include <boost/property_map.hpp>
-#include <boost/shared_ptr.hpp>
-#include <vector>
-
-namespace boost {
- template<typename T, typename IndexMap = identity_property_map>
- class vector_property_map
- : public boost::put_get_helper<
- typename std::iterator_traits<
- typename std::vector<T>::iterator >::reference,
- vector_property_map<T, IndexMap> >
- {
- public:
- typedef typename property_traits<IndexMap>::key_type key_type;
- typedef T value_type;
- typedef typename std::iterator_traits<
- typename std::vector<T>::iterator >::reference reference;
- typedef boost::lvalue_property_map_tag category;
-
- vector_property_map(const IndexMap& index = IndexMap())
- : store(new std::vector<T>()), index(index)
- {}
-
- vector_property_map(unsigned initial_size,
- const IndexMap& index = IndexMap())
- : store(new std::vector<T>(initial_size)), index(index)
- {}
-
- typename std::vector<T>::iterator storage_begin()
- {
- return store->begin();
- }
-
- typename std::vector<T>::iterator storage_end()
- {
- return store->end();
- }
-
- typename std::vector<T>::const_iterator storage_begin() const
- {
- return store->begin();
- }
-
- typename std::vector<T>::const_iterator storage_end() const
- {
- return store->end();
- }
-
- IndexMap& get_index_map() { return index; }
- const IndexMap& get_index_map() const { return index; }
-
- public:
- // Copy ctor absent, default semantics is OK.
- // Assignment operator absent, default semantics is OK.
- // CONSIDER: not sure that assignment to 'index' is correct.
-
- reference operator[](const key_type& v) const {
- typename property_traits<IndexMap>::value_type i = get(index, v);
- if (static_cast<unsigned>(i) >= store->size()) {
- store->resize(i + 1, T());
- }
- return (*store)[i];
- }
- private:
- // Conceptually, we have a vector of infinite size. For practical
- // purposes, we start with an empty vector and grow it as needed.
- // Note that we cannot store pointer to vector here -- we cannot
- // store pointer to data, because if copy of property map resizes
- // the vector, the pointer to data will be invalidated.
- // I wonder if class 'pmap_ref' is simply needed.
- shared_ptr< std::vector<T> > store;
- IndexMap index;
- };
-
- template<typename T, typename IndexMap>
- vector_property_map<T, IndexMap>
- make_vector_property_map(IndexMap index)
- {
- return vector_property_map<T, IndexMap>(index);
- }
-}
+/*=============================================================================
+Copyright (c) 2009 Trustees of Indiana University
+Distributed under the Boost Software License, Version 1.0. (See accompanying
+file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+// Redirect/warning header, adapted from the version in Spirit
+
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
+# pragma message ("Warning: This header is deprecated. Please use: boost/property_map/vector_property_map.hpp")
+#elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
+# warning "This header is deprecated. Please use: boost/property_map/vector_property_map.hpp"
+#endif
#endif
Modified: trunk/libs/graph/doc/PlanarEmbedding.html
==============================================================================
--- trunk/libs/graph/doc/PlanarEmbedding.html (original)
+++ trunk/libs/graph/doc/PlanarEmbedding.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -137,7 +137,7 @@
PlanarEmbedding:
<pre>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <vector>
...
@@ -175,4 +175,4 @@
Copyright © 2007 Aaron Windsor (<a href="mailto:aaron.windsor_at_[hidden]">
aaron.windsor_at_[hidden]</a>)
-</body></html>
\ No newline at end of file
+</body></html>
Modified: trunk/libs/graph/doc/biconnected_components.w
==============================================================================
--- trunk/libs/graph/doc/biconnected_components.w (original)
+++ trunk/libs/graph/doc/biconnected_components.w 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -285,7 +285,7 @@
#include <boost/limits.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/graph_concepts.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
namespace boost {
@<Biconnected Components Algorithm@>
Modified: trunk/libs/graph/doc/eg1-iso.cpp
==============================================================================
--- trunk/libs/graph/doc/eg1-iso.cpp (original)
+++ trunk/libs/graph/doc/eg1-iso.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -20,7 +20,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/isomorphism.hpp>
//#include "isomorphism-v3.hpp"
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <iostream>
#include <fstream>
#include <map>
Modified: trunk/libs/graph/doc/isomorphism-impl.w
==============================================================================
--- trunk/libs/graph/doc/isomorphism-impl.w (original)
+++ trunk/libs/graph/doc/isomorphism-impl.w 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -1007,7 +1007,7 @@
#include <boost/graph/detail/permutation.hpp>
#include <boost/graph/named_function_params.hpp>
#include <boost/graph/graph_concepts.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/pending/integer_range.hpp>
#include <boost/limits.hpp>
#include <boost/static_assert.hpp>
Modified: trunk/libs/graph/doc/trouble_shooting.html
==============================================================================
--- trunk/libs/graph/doc/trouble_shooting.html (original)
+++ trunk/libs/graph/doc/trouble_shooting.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -50,7 +50,8 @@
<p>There is a VC++ bug that appears when using <tt>get(property,
graph, edge)</tt>. A workaround is to use <tt>get(get(property,
-graph), edge)</tt> instead.
+graph), edge)</tt> instead. <i>Note that <tt>boost/property_map.hpp</tt> has
+now been moved to <tt>boost/property_map/property_map.hpp</tt>.
<hr>
Modified: trunk/libs/graph/doc/using_property_maps.html
==============================================================================
--- trunk/libs/graph/doc/using_property_maps.html (original)
+++ trunk/libs/graph/doc/using_property_maps.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -287,7 +287,7 @@
The reason that pointers can be used as property maps is that
there are several overloaded functions and a specialization of
<TT>property_traits</TT> in the header <a
-href="../../../boost/property_map.hpp"><TT>boost/property_map.hpp</TT></a>
+href="../../../boost/property_map/property_map.hpp"><TT>boost/property_map/property_map.hpp</TT></a>
that implement the property map interface in terms of
pointers. The definition of those functions is listed here.
Modified: trunk/libs/graph/example/adjacency_list.cpp
==============================================================================
--- trunk/libs/graph/example/adjacency_list.cpp (original)
+++ trunk/libs/graph/example/adjacency_list.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -14,7 +14,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graph_utility.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
/*
Sample Output
Modified: trunk/libs/graph/example/bfs.cpp
==============================================================================
--- trunk/libs/graph/example/bfs.cpp (original)
+++ trunk/libs/graph/example/bfs.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -17,7 +17,7 @@
#include <boost/graph/visitors.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/breadth_first_search.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_utility.hpp>
/*
Modified: trunk/libs/graph/example/bfs_neighbor.cpp
==============================================================================
--- trunk/libs/graph/example/bfs_neighbor.cpp (original)
+++ trunk/libs/graph/example/bfs_neighbor.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -18,7 +18,7 @@
#include <boost/graph/visitors.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/neighbor_bfs.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
/*
Modified: trunk/libs/graph/example/canonical_ordering.cpp
==============================================================================
--- trunk/libs/graph/example/canonical_ordering.cpp (original)
+++ trunk/libs/graph/example/canonical_ordering.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -9,7 +9,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/ref.hpp>
#include <vector>
Modified: trunk/libs/graph/example/city_visitor.cpp
==============================================================================
--- trunk/libs/graph/example/city_visitor.cpp (original)
+++ trunk/libs/graph/example/city_visitor.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -16,7 +16,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/depth_first_search.hpp>
#include <boost/graph/breadth_first_search.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/graph_utility.hpp> // for boost::make_list
Modified: trunk/libs/graph/example/edge_property.cpp
==============================================================================
--- trunk/libs/graph/example/edge_property.cpp (original)
+++ trunk/libs/graph/example/edge_property.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -52,7 +52,7 @@
#include <iostream>
#include <boost/utility.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/adjacency_list.hpp>
Modified: trunk/libs/graph/example/exterior_properties.cpp
==============================================================================
--- trunk/libs/graph/example/exterior_properties.cpp (original)
+++ trunk/libs/graph/example/exterior_properties.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -36,7 +36,7 @@
#include <boost/config.hpp>
#include <iostream>
#include <boost/graph/adjacency_list.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
template <class Graph, class Capacity, class Flow>
void print_network(Graph& G, Capacity capacity, Flow flow)
Modified: trunk/libs/graph/example/exterior_property_map.cpp
==============================================================================
--- trunk/libs/graph/example/exterior_property_map.cpp (original)
+++ trunk/libs/graph/example/exterior_property_map.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -12,7 +12,7 @@
#include <algorithm>
#include <string>
#include <boost/graph/adjacency_list.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
using namespace std;
using namespace boost;
Modified: trunk/libs/graph/example/interior_pmap_bundled.cpp
==============================================================================
--- trunk/libs/graph/example/interior_pmap_bundled.cpp (original)
+++ trunk/libs/graph/example/interior_pmap_bundled.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -12,7 +12,7 @@
#include <iostream>
#include <algorithm>
#include <boost/graph/adjacency_list.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <string>
using namespace std;
Modified: trunk/libs/graph/example/interior_property_map.cpp
==============================================================================
--- trunk/libs/graph/example/interior_property_map.cpp (original)
+++ trunk/libs/graph/example/interior_property_map.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -11,7 +11,7 @@
#include <iostream>
#include <algorithm>
#include <boost/graph/adjacency_list.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <string>
using namespace std;
Modified: trunk/libs/graph/example/iterator-property-map-eg.cpp
==============================================================================
--- trunk/libs/graph/example/iterator-property-map-eg.cpp (original)
+++ trunk/libs/graph/example/iterator-property-map-eg.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//=======================================================================
#include <iostream>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
int
main()
Modified: trunk/libs/graph/example/johnson-eg.cpp
==============================================================================
--- trunk/libs/graph/example/johnson-eg.cpp (original)
+++ trunk/libs/graph/example/johnson-eg.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -10,7 +10,7 @@
#include <iostream>
#include <vector>
#include <iomanip>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graphviz.hpp>
#include <boost/graph/johnson_all_pairs_shortest.hpp>
Modified: trunk/libs/graph/example/knights-tour.cpp
==============================================================================
--- trunk/libs/graph/example/knights-tour.cpp (original)
+++ trunk/libs/graph/example/knights-tour.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -13,7 +13,7 @@
#include <boost/operators.hpp>
#include <boost/graph/breadth_first_search.hpp>
#include <boost/graph/visitors.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
using namespace boost;
Modified: trunk/libs/graph/example/kuratowski_subgraph.cpp
==============================================================================
--- trunk/libs/graph/example/kuratowski_subgraph.cpp (original)
+++ trunk/libs/graph/example/kuratowski_subgraph.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -9,7 +9,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/ref.hpp>
#include <vector>
Modified: trunk/libs/graph/example/make_biconnected_planar.cpp
==============================================================================
--- trunk/libs/graph/example/make_biconnected_planar.cpp (original)
+++ trunk/libs/graph/example/make_biconnected_planar.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -9,7 +9,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/ref.hpp>
#include <vector>
Modified: trunk/libs/graph/example/make_connected.cpp
==============================================================================
--- trunk/libs/graph/example/make_connected.cpp (original)
+++ trunk/libs/graph/example/make_connected.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -9,7 +9,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <vector>
#include <boost/graph/connected_components.hpp>
Modified: trunk/libs/graph/example/make_maximal_planar.cpp
==============================================================================
--- trunk/libs/graph/example/make_maximal_planar.cpp (original)
+++ trunk/libs/graph/example/make_maximal_planar.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -9,7 +9,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/ref.hpp>
#include <vector>
Modified: trunk/libs/graph/example/neighbor_bfs.cpp
==============================================================================
--- trunk/libs/graph/example/neighbor_bfs.cpp (original)
+++ trunk/libs/graph/example/neighbor_bfs.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -18,7 +18,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graph_utility.hpp>
#include <boost/graph/neighbor_bfs.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
/*
Modified: trunk/libs/graph/example/planar_face_traversal.cpp
==============================================================================
--- trunk/libs/graph/example/planar_face_traversal.cpp (original)
+++ trunk/libs/graph/example/planar_face_traversal.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -9,7 +9,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/ref.hpp>
#include <vector>
Modified: trunk/libs/graph/example/put-get-helper-eg.cpp
==============================================================================
--- trunk/libs/graph/example/put-get-helper-eg.cpp (original)
+++ trunk/libs/graph/example/put-get-helper-eg.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -7,7 +7,7 @@
//=======================================================================
#include <vector>
#include <string>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#ifdef BOOST_NO_STD_ITERATOR_TRAITS
#error This examples requires a compiler that provides a working std::iterator_traits
Modified: trunk/libs/graph/example/straight_line_drawing.cpp
==============================================================================
--- trunk/libs/graph/example/straight_line_drawing.cpp (original)
+++ trunk/libs/graph/example/straight_line_drawing.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -9,7 +9,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <vector>
#include <boost/graph/planar_canonical_ordering.hpp>
Modified: trunk/libs/graph/module.cmake
==============================================================================
--- trunk/libs/graph/module.cmake (original)
+++ trunk/libs/graph/module.cmake 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -1,3 +1,3 @@
boost_module(graph DEPENDS property_map tuple multi_index any random)
-# any is there because of the dependency on boost/dynamic_property_map.hpp
+# any is there because of the dependency on boost/property_map/dynamic_property_map.hpp
Modified: trunk/libs/graph/test/adjacency_matrix_test.cpp
==============================================================================
--- trunk/libs/graph/test/adjacency_matrix_test.cpp (original)
+++ trunk/libs/graph/test/adjacency_matrix_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -16,7 +16,7 @@
* Defines the boost::property_map class template and the boost::get and
* boost::put function templates.
*/
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
/*
* Defines the boost::graph_traits class template.
Modified: trunk/libs/graph/test/all_planar_input_files_test.cpp
==============================================================================
--- trunk/libs/graph/test/all_planar_input_files_test.cpp (original)
+++ trunk/libs/graph/test/all_planar_input_files_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -25,7 +25,7 @@
#include <utility>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/filesystem.hpp>
Modified: trunk/libs/graph/test/basic_planarity_test.cpp
==============================================================================
--- trunk/libs/graph/test/basic_planarity_test.cpp (original)
+++ trunk/libs/graph/test/basic_planarity_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -9,8 +9,8 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/boyer_myrvold_planar_test.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <boost/test/minimal.hpp>
Modified: trunk/libs/graph/test/betweenness_centrality_test.cpp
==============================================================================
--- trunk/libs/graph/test/betweenness_centrality_test.cpp (original)
+++ trunk/libs/graph/test/betweenness_centrality_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -12,7 +12,7 @@
#include <vector>
#include <stack>
#include <queue>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/test/minimal.hpp>
#include <boost/random/uniform_01.hpp>
#include <boost/random/linear_congruential.hpp>
Modified: trunk/libs/graph/test/core_numbers_test.cpp
==============================================================================
--- trunk/libs/graph/test/core_numbers_test.cpp (original)
+++ trunk/libs/graph/test/core_numbers_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -2,7 +2,7 @@
#include <vector>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/core_numbers.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
using namespace boost;
Modified: trunk/libs/graph/test/dag_longest_paths.cpp
==============================================================================
--- trunk/libs/graph/test/dag_longest_paths.cpp (original)
+++ trunk/libs/graph/test/dag_longest_paths.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -6,7 +6,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/dag_shortest_paths.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <boost/test/minimal.hpp>
using namespace boost;
Modified: trunk/libs/graph/test/graphviz_test.cpp
==============================================================================
--- trunk/libs/graph/test/graphviz_test.cpp (original)
+++ trunk/libs/graph/test/graphviz_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -18,7 +18,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/tuple/tuple.hpp>
-#include <boost/dynamic_property_map.hpp>
+#include <boost/property_map/dynamic_property_map.hpp>
#include <boost/test/test_tools.hpp>
#include <boost/test/floating_point_comparison.hpp>
#include <algorithm>
Modified: trunk/libs/graph/test/is_straight_line_draw_test.cpp
==============================================================================
--- trunk/libs/graph/test/is_straight_line_draw_test.cpp (original)
+++ trunk/libs/graph/test/is_straight_line_draw_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//=======================================================================
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/test/minimal.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/properties.hpp>
Modified: trunk/libs/graph/test/isomorphism.cpp
==============================================================================
--- trunk/libs/graph/test/isomorphism.cpp (original)
+++ trunk/libs/graph/test/isomorphism.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -24,7 +24,7 @@
#include <boost/test/minimal.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/isomorphism.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/random/variate_generator.hpp>
#include <boost/random/uniform_real.hpp>
#include <boost/random/uniform_int.hpp>
Modified: trunk/libs/graph/test/johnson-test.cpp
==============================================================================
--- trunk/libs/graph/test/johnson-test.cpp (original)
+++ trunk/libs/graph/test/johnson-test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -27,7 +27,7 @@
#include <iostream>
#include <vector>
#include <iomanip>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graphviz.hpp>
#include <boost/graph/johnson_all_pairs_shortest.hpp>
Modified: trunk/libs/graph/test/kolmogorov_max_flow_test.cpp
==============================================================================
--- trunk/libs/graph/test/kolmogorov_max_flow_test.cpp (original)
+++ trunk/libs/graph/test/kolmogorov_max_flow_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -41,7 +41,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/adjacency_matrix.hpp>
#include <boost/graph/random.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/random/linear_congruential.hpp>
#include <boost/lexical_cast.hpp>
Modified: trunk/libs/graph/test/make_bicon_planar_test.cpp
==============================================================================
--- trunk/libs/graph/test/make_bicon_planar_test.cpp (original)
+++ trunk/libs/graph/test/make_bicon_planar_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -11,8 +11,8 @@
#include <boost/graph/make_biconnected_planar.hpp>
#include <boost/graph/biconnected_components.hpp>
#include <boost/graph/boyer_myrvold_planar_test.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <boost/test/minimal.hpp>
Modified: trunk/libs/graph/test/make_connected_test.cpp
==============================================================================
--- trunk/libs/graph/test/make_connected_test.cpp (original)
+++ trunk/libs/graph/test/make_connected_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -10,8 +10,8 @@
#include <boost/graph/properties.hpp>
#include <boost/graph/make_connected.hpp>
#include <boost/graph/connected_components.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <boost/test/minimal.hpp>
Modified: trunk/libs/graph/test/make_maximal_planar_test.cpp
==============================================================================
--- trunk/libs/graph/test/make_maximal_planar_test.cpp (original)
+++ trunk/libs/graph/test/make_maximal_planar_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -10,8 +10,8 @@
#include <boost/graph/properties.hpp>
#include <boost/graph/make_maximal_planar.hpp>
#include <boost/graph/boyer_myrvold_planar_test.hpp>
-#include <boost/property_map.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <boost/test/minimal.hpp>
Modified: trunk/libs/graph/test/matching_test.cpp
==============================================================================
--- trunk/libs/graph/test/matching_test.cpp (original)
+++ trunk/libs/graph/test/matching_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -10,7 +10,7 @@
#include <boost/graph/max_cardinality_matching.hpp>
#include <iostream> // for std::cout
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/adjacency_matrix.hpp>
#include <boost/graph/random.hpp>
Modified: trunk/libs/graph/test/max_flow_test.cpp
==============================================================================
--- trunk/libs/graph/test/max_flow_test.cpp (original)
+++ trunk/libs/graph/test/max_flow_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -43,7 +43,7 @@
//boost utilities we use
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/random.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/random/linear_congruential.hpp>
#include <boost/lexical_cast.hpp>
Modified: trunk/libs/graph/test/parallel_edges_loops_test.cpp
==============================================================================
--- trunk/libs/graph/test/parallel_edges_loops_test.cpp (original)
+++ trunk/libs/graph/test/parallel_edges_loops_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -23,7 +23,7 @@
#include <utility>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/filesystem.hpp>
Modified: trunk/libs/graph/test/random_matching_test.cpp
==============================================================================
--- trunk/libs/graph/test/random_matching_test.cpp (original)
+++ trunk/libs/graph/test/random_matching_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -8,7 +8,7 @@
//=======================================================================
#include <cstdlib>
#include <iostream>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/random.hpp>
#include <ctime>
Modified: trunk/libs/property_map/associative_property_map.html
==============================================================================
--- trunk/libs/property_map/associative_property_map.html (original)
+++ trunk/libs/property_map/associative_property_map.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -45,7 +45,7 @@
<pre>#include <iostream>
#include <map>
#include <string>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
template <typename AddressMap>
@@ -89,7 +89,7 @@
<H3>Where Defined</H3>
<P>
-boost/property_map.hpp
+boost/property_map/property_map.hpp
<p>
<H3>Model Of</H3>
Modified: trunk/libs/property_map/const_assoc_property_map.html
==============================================================================
--- trunk/libs/property_map/const_assoc_property_map.html (original)
+++ trunk/libs/property_map/const_assoc_property_map.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -46,7 +46,7 @@
<font color="#008040">#include <iostream></font>
<font color="#008040">#include <map></font>
<font color="#008040">#include <string></font>
-<font color="#008040">#include <boost/property_map.hpp></font>
+<font color="#008040">#include <boost/property_map/property_map.hpp></font>
<B>template</B> <<B>typename</B> ConstAddressMap>
@@ -89,7 +89,7 @@
<H3>Where Defined</H3>
<P>
-boost/property_map.hpp
+boost/property_map/property_map.hpp
<p>
<H3>Model Of</H3>
Modified: trunk/libs/property_map/example1.cpp
==============================================================================
--- trunk/libs/property_map/example1.cpp (original)
+++ trunk/libs/property_map/example1.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -6,7 +6,7 @@
#include <iostream>
#include <map>
#include <string>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
template <typename AddressMap>
Modified: trunk/libs/property_map/example2.cpp
==============================================================================
--- trunk/libs/property_map/example2.cpp (original)
+++ trunk/libs/property_map/example2.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -8,7 +8,7 @@
#include <iostream>
#include <map>
#include <string>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
template <typename ConstAddressMap>
Modified: trunk/libs/property_map/example3.cpp
==============================================================================
--- trunk/libs/property_map/example3.cpp (original)
+++ trunk/libs/property_map/example3.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -3,7 +3,7 @@
// (See accompanying file LICENSE_1_0.txt
// or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <string>
#include <iostream>
Modified: trunk/libs/property_map/identity_property_map.html
==============================================================================
--- trunk/libs/property_map/identity_property_map.html (original)
+++ trunk/libs/property_map/identity_property_map.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -31,7 +31,7 @@
<H3>Where Defined</H3>
<P>
-boost/property_map.hpp
+boost/property_map/property_map.hpp
<h3>Model of</h3>
Modified: trunk/libs/property_map/iterator_property_map.html
==============================================================================
--- trunk/libs/property_map/iterator_property_map.html (original)
+++ trunk/libs/property_map/iterator_property_map.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -99,7 +99,7 @@
<H3>Where Defined</H3>
<P>
-boost/property_map.hpp
+boost/property_map/property_map.hpp
<p>
<H3>Model Of</H3>
Modified: trunk/libs/property_map/property_map.html
==============================================================================
--- trunk/libs/property_map/property_map.html (original)
+++ trunk/libs/property_map/property_map.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -101,7 +101,7 @@
<pre>#include <iostream>
#include <map>
#include <string>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
template <typename AddressMap>
@@ -214,7 +214,7 @@
<P>
There is a tag struct for each of the categories of property
maps, which is defined in the header
-<tt><boost/property_map.hpp></tt>.
+<tt><boost/property_map/property_map.hpp></tt>.
<PRE>namespace boost {
@@ -241,7 +241,7 @@
of <TT>boost::property_traits</TT> so that pointers can be used as
property map objects. In addition, the property map
functions are overloaded for pointers. These traits classes and
-functions are defined in <tt><boost/property_map.hpp></tt>.
+functions are defined in <tt><boost/property_map/property_map.hpp></tt>.
<PRE>namespace boost {
@@ -262,7 +262,7 @@
The following specialization of the <tt>property_traits</tt> class
and the overloads of <tt>put()</tt> and <tt>get()</tt> make it
possible to use builtin C++ pointer types as property maps. These
- are defined in <tt>boost/property_map.hpp</tt>. More specifically,
+ are defined in <tt>boost/property_map/property_map.hpp</tt>. More specifically,
it means that <tt>T*</tt> is a model of <a
href="./LvaluePropertyMap.html">LvaluePropertyMap</a>, given a key
type that is at least convertible <tt>std::ptrdiff_t</tt>.
Modified: trunk/libs/property_map/ref_property_map.html
==============================================================================
--- trunk/libs/property_map/ref_property_map.html (original)
+++ trunk/libs/property_map/ref_property_map.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -29,7 +29,7 @@
<H3>Where Defined</H3>
<P>
-boost/property_map.hpp
+boost/property_map/property_map.hpp
<h3>Model of</h3>
Modified: trunk/libs/property_map/test/dynamic_properties_test.cpp
==============================================================================
--- trunk/libs/property_map/test/dynamic_properties_test.cpp (original)
+++ trunk/libs/property_map/test/dynamic_properties_test.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -18,8 +18,8 @@
#endif
#include <boost/test/minimal.hpp>
-#include <boost/dynamic_property_map.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/dynamic_property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <map>
#include <iostream>
#include <string>
Modified: trunk/libs/property_map/test/property_map_cc.cpp
==============================================================================
--- trunk/libs/property_map/test/property_map_cc.cpp (original)
+++ trunk/libs/property_map/test/property_map_cc.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -3,7 +3,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <map>
// This file checks the property map concepts against the property map
Modified: trunk/libs/property_map/vector_property_map.html
==============================================================================
--- trunk/libs/property_map/vector_property_map.html (original)
+++ trunk/libs/property_map/vector_property_map.html 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -51,7 +51,7 @@
<p>
<pre>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
#include <string>
#include <iostream>
@@ -72,7 +72,7 @@
<H3>Where Defined</H3>
<P>
-boost/vector_property_map.hpp
+boost/property_map/vector_property_map.hpp
<p>
<H3>Model Of</H3>
Modified: trunk/libs/python/src/object/inheritance.cpp
==============================================================================
--- trunk/libs/python/src/object/inheritance.cpp (original)
+++ trunk/libs/python/src/object/inheritance.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -10,7 +10,7 @@
#endif
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/reverse_graph.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/bind.hpp>
#include <boost/integer_traits.hpp>
#include <boost/tuple/tuple.hpp>
Modified: trunk/libs/signals/test/random_signal_system.cpp
==============================================================================
--- trunk/libs/signals/test/random_signal_system.cpp (original)
+++ trunk/libs/signals/test/random_signal_system.cpp 2009-04-06 21:28:38 EDT (Mon, 06 Apr 2009)
@@ -11,7 +11,7 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/breadth_first_search.hpp>
#include <boost/graph/dijkstra_shortest_paths.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
#include <boost/random.hpp>
#include <map>
#include <set>