[Boost-commit] svn:boost r79855 - in trunk/boost: graph graph/distributed/adjlist pending

Subject: [Boost-commit] svn:boost r79855 - in trunk/boost: graph graph/distributed/adjlist pending
From: jewillco_at_[hidden]
Date: 2012-08-02 14:05:12

Author: jewillco
Date: 2012-08-02 14:05:11 EDT (Thu, 02 Aug 2012)
New Revision: 79855
URL: http://svn.boost.org/trac/boost/changeset/79855

Log:
Removed retag_property_list and all uses of it
Text files modified: 
   trunk/boost/graph/distributed/adjlist/serialization.hpp |    13 ---------                               
   trunk/boost/graph/undirected_graph.hpp                  |     5 ---                                     
   trunk/boost/pending/property.hpp                        |    52 ----------------------------------------
   3 files changed, 1 insertions(+), 69 deletions(-)

Modified: trunk/boost/graph/distributed/adjlist/serialization.hpp
==============================================================================
--- trunk/boost/graph/distributed/adjlist/serialization.hpp	(original)
+++ trunk/boost/graph/distributed/adjlist/serialization.hpp	2012-08-02 14:05:11 EDT (Thu, 02 Aug 2012)
@@ -833,12 +833,7 @@
     typedef typename graph_traits<
         Graph>::edge_descriptor edge_descriptor;
 
-    // We retag the property list here so that bundled properties are
-    // properly placed into property<edge_bundle_t, Bundle>.
-    typedef typename boost::detail::retag_property_list<
-              edge_bundle_t,
-              typename Graph::edge_property_type>::type
-      edge_property_type;
+    typedef typename Graph::edge_property_type edge_property_type;
 
     int E = num_edges(g);
     ar << BOOST_SERIALIZATION_NVP(E);
@@ -947,12 +942,6 @@
 template <class OStreamConstructibleArchive>
 void PBGL_DISTRIB_ADJLIST_TYPE::save(std::string const& filename) const
 {
-    // We retag the property list here so that bundled properties are
-    // properly placed into property<vertex_bundle_t, Bundle>.
-    typedef typename boost::detail::retag_property_list<
-        vertex_bundle_t, vertex_property_type
-    >::type vertex_property_type;
-
     typedef typename config_type::VertexListS vertex_list_selector;
 
     process_group_type pg = process_group();

Modified: trunk/boost/graph/undirected_graph.hpp
==============================================================================
--- trunk/boost/graph/undirected_graph.hpp	(original)
+++ trunk/boost/graph/undirected_graph.hpp	2012-08-02 14:05:11 EDT (Thu, 02 Aug 2012)
@@ -10,11 +10,6 @@
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/properties.hpp>
 
-// NOTE: The retag_property_list is used to "normalize" a proeprty such that
-// any non-property conforming parameter is wrapped in a vertex_bundle
-// property. For example (with bad syntax) retag<property<X>> -> property<X>,
-// but retag<foo> -> property<vertex_bundle_t, foo>.
-
 namespace boost
 {
 struct undirected_graph_tag { };

Modified: trunk/boost/pending/property.hpp
==============================================================================
--- trunk/boost/pending/property.hpp	(original)
+++ trunk/boost/pending/property.hpp	2012-08-02 14:05:11 EDT (Thu, 02 Aug 2012)
@@ -199,58 +199,6 @@
         : mpl::bool_<is_same<T, no_property>::value>
     { };
 
-    /** @internal @name Retag Property List
-     * This metafunction is used internally to normalize a property if it is
-     * actually modeling a property. Specifically this is used in Boost.Graph
-     * to map user-provided classes into bundled properties.
-     */
-    //@{
-    // One base case of the recursive form (see below). This matches any
-    // retag request that does not include a property<...> or no_property as
-    // the FinalType. This is used for generating bundles in Boost.Graph.
-    template<typename FinalTag, typename FinalType>
-    struct retag_property_list
-    {
-        typedef property<FinalTag, FinalType> type;
-        typedef FinalType retagged;
-    };
-
-    // Recursively retag the nested property list.
-    template<typename FinalTag, typename Tag, typename T, typename Base>
-    struct retag_property_list<FinalTag, property<Tag, T, Base> >
-    {
-    private:
-        typedef retag_property_list<FinalTag, Base> next;
-
-    public:
-        typedef property<Tag, T, typename next::type> type;
-        typedef typename next::retagged retagged;
-    };
-
-    // This base case will correctly deduce the final property type if the
-    // retagged property is given in property form. This should not hide
-    // the base case below.
-    // NOTE: This addresses a problem of layering bundled properties in the BGL
-    // where multiple retaggings will fail to deduce the correct retagged
-    // type.
-    template<typename FinalTag, typename FinalType>
-    struct retag_property_list<FinalTag, property<FinalTag, FinalType> >
-    {
-    public:
-        typedef property<FinalTag, FinalType> type;
-        typedef FinalType retagged;
-    };
-
-    // A final base case of the retag_property_list, this will terminate a
-    // properly structured list.
-    template<typename FinalTag>
-    struct retag_property_list<FinalTag, no_property>
-    {
-        typedef no_property type;
-        typedef no_property retagged;
-    };
-    //@}
-
     template <typename PList, typename Tag>
     class lookup_one_property_f;