Update of /cvsroot/boost/boost/boost/graph
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6788
Modified Files:
adjacency_list.hpp adjacency_matrix.hpp
compressed_sparse_row_graph.hpp edge_list.hpp
graph_selectors.hpp johnson_all_pairs_shortest.hpp
properties.hpp property_iter_range.hpp
Log Message:
Replaced uses of ct_if and friends (based on pending/ct_if.hpp) with
uses of mpl::if_ and friends.
Index: adjacency_list.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/adjacency_list.hpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- adjacency_list.hpp 22 Apr 2006 13:35:32 -0000 1.51
+++ adjacency_list.hpp 4 Dec 2006 23:23:08 -0000 1.52
@@ -36,7 +36,10 @@
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/graph_selectors.hpp>
#include <boost/property_map.hpp>
-#include <boost/pending/ct_if.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/and.hpp>
+#include <boost/mpl/not.hpp>
+#include <boost/mpl/bool.hpp>
#include <boost/graph/detail/edge.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/detail/workaround.hpp>
@@ -238,12 +241,12 @@
namespace detail {
template <class Directed> struct is_random_access {
enum { value = false};
- typedef false_type type;
+ typedef mpl::false_ type;
};
template <>
struct is_random_access<vecS> {
enum { value = true };
- typedef true_type type;
+ typedef mpl::true_ type;
};
} // namespace detail
@@ -268,9 +271,9 @@
typedef typename DirectedS::is_bidir_t is_bidir;
typedef typename DirectedS::is_directed_t is_directed;
- typedef typename boost::ct_if_t<is_bidir,
+ typedef typename mpl::if_<is_bidir,
bidirectional_tag,
- typename boost::ct_if_t<is_directed,
+ typename mpl::if_<is_directed,
directed_tag, undirected_tag
>::type
>::type directed_category;
@@ -279,7 +282,7 @@
edge_parallel_category;
typedef void* vertex_ptr;
- typedef typename boost::ct_if_t<is_rand_access,
+ typedef typename mpl::if_<is_rand_access,
std::size_t, vertex_ptr>::type vertex_descriptor;
typedef detail::edge_desc_impl<directed_category, vertex_descriptor>
edge_descriptor;
@@ -292,10 +295,10 @@
typedef typename container_gen<EdgeListS, dummy>::type EdgeContainer;
typedef typename DirectedS::is_bidir_t BidirectionalT;
typedef typename DirectedS::is_directed_t DirectedT;
- typedef typename ct_and<DirectedT,
- typename ct_not<BidirectionalT>::type >::type on_edge_storage;
+ typedef typename mpl::and_<DirectedT,
+ typename mpl::not_<BidirectionalT>::type >::type on_edge_storage;
public:
- typedef typename boost::ct_if_t<on_edge_storage,
+ typedef typename mpl::if_<on_edge_storage,
std::size_t, typename EdgeContainer::size_type
>::type edges_size_type;
@@ -352,10 +355,10 @@
edge_property_type;
// The types that are actually bundled
- typedef typename ct_if<(is_same<maybe_vertex_bundled, no_property>::value),
+ typedef typename mpl::if_c<(is_same<maybe_vertex_bundled,
no_property>::value),
no_vertex_bundle,
maybe_vertex_bundled>::type vertex_bundled;
- typedef typename ct_if<(is_same<maybe_edge_bundled, no_property>::value),
+ typedef typename mpl::if_c<(is_same<maybe_edge_bundled,
no_property>::value),
no_edge_bundle,
maybe_edge_bundled>::type edge_bundled;
#else
Index: adjacency_matrix.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/adjacency_matrix.hpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- adjacency_matrix.hpp 7 Feb 2006 13:15:35 -0000 1.46
+++ adjacency_matrix.hpp 4 Dec 2006 23:23:08 -0000 1.47
@@ -19,7 +19,7 @@
#include <boost/iterator.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/graph_selectors.hpp>
-#include <boost/pending/ct_if.hpp>
+#include <boost/mpl/if.hpp>
#include <boost/graph/adjacency_iterator.hpp>
#include <boost/graph/detail/edge.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
@@ -438,7 +438,7 @@
// in_degree, etc.).
BOOST_STATIC_ASSERT(!(is_same<Directed, bidirectionalS>::value));
- typedef typename boost::ct_if_t<is_directed,
+ typedef typename mpl::if_<is_directed,
bidirectional_tag, undirected_tag>::type
directed_category;
@@ -492,10 +492,10 @@
public:
// The types that are actually bundled
- typedef typename ct_if<(is_same<maybe_vertex_bundled, no_property>::value),
+ typedef typename mpl::if_c<(is_same<maybe_vertex_bundled,
no_property>::value),
no_vertex_bundle,
maybe_vertex_bundled>::type vertex_bundled;
- typedef typename ct_if<(is_same<maybe_edge_bundled, no_property>::value),
+ typedef typename mpl::if_c<(is_same<maybe_edge_bundled,
no_property>::value),
no_edge_bundle,
maybe_edge_bundled>::type edge_bundled;
#else
@@ -506,7 +506,7 @@
#endif
public: // should be private
- typedef typename ct_if_t<typename has_property<edge_property_type>::type,
+ typedef typename mpl::if_<typename has_property<edge_property_type>::type,
std::pair<bool, edge_property_type>, char>::type StoredEdge;
#if (defined(BOOST_MSVC) && BOOST_MSVC <= 1300) ||
defined(BOOST_NO_STD_ALLOCATOR)
typedef std::vector<StoredEdge> Matrix;
@@ -540,7 +540,7 @@
vertex_descriptor, MatrixIter, size_type, edge_descriptor
> UnDirOutEdgeIter;
- typedef typename ct_if_t<
+ typedef typename mpl::if_<
typename Directed::is_directed_t, DirOutEdgeIter, UnDirOutEdgeIter
>::type unfiltered_out_edge_iter;
@@ -552,7 +552,7 @@
vertex_descriptor, MatrixIter, size_type, edge_descriptor
> UnDirInEdgeIter;
- typedef typename ct_if_t<
+ typedef typename mpl::if_<
typename Directed::is_directed_t, DirInEdgeIter, UnDirInEdgeIter
>::type unfiltered_in_edge_iter;
Index: compressed_sparse_row_graph.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/compressed_sparse_row_graph.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- compressed_sparse_row_graph.hpp 29 Nov 2006 20:30:11 -0000 1.16
+++ compressed_sparse_row_graph.hpp 4 Dec 2006 23:23:08 -0000 1.17
@@ -739,7 +739,7 @@
typedef graph_traits<BOOST_CSR_GRAPH_TYPE> traits;
typedef VertexProperty vertex_bundled;
typedef EdgeProperty edge_bundled;
- typedef typename ct_if<(detail::is_vertex_bundle<vertex_bundled,
edge_bundled, Bundle>::value),
+ typedef typename mpl::if_c<(detail::is_vertex_bundle<vertex_bundled,
edge_bundled, Bundle>::value),
typename traits::vertex_descriptor,
typename traits::edge_descriptor>::type
descriptor;
Index: edge_list.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/edge_list.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- edge_list.hpp 24 Mar 2005 14:54:08 -0000 1.11
+++ edge_list.hpp 4 Dec 2006 23:23:08 -0000 1.12
@@ -13,7 +13,8 @@
#include <iterator>
#include <boost/config.hpp>
-#include <boost/pending/ct_if.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/bool.hpp>
#include <boost/pending/integer_range.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/properties.hpp>
@@ -241,11 +242,11 @@
template <class Cat>
struct is_random {
enum { RET = false };
- typedef false_type type;
+ typedef mpl::false_ type;
};
template <>
struct is_random<std::random_access_iterator_tag> {
- enum { RET = true }; typedef true_type type;
+ enum { RET = true }; typedef mpl::true_ type;
};
// The edge_list class conditionally inherits from one of the
@@ -262,7 +263,7 @@
class Cat>
#endif
class edge_list
- : public ct_if_t< typename is_random<Cat>::type,
+ : public mpl::if_< typename is_random<Cat>::type,
edge_list_impl_ra< edge_list<EdgeIter,T,D,Cat>,
EdgeIter,T,D>,
edge_list_impl< edge_list<EdgeIter,T,D,Cat>, EdgeIter,T,D>
>::type
Index: graph_selectors.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/graph_selectors.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- graph_selectors.hpp 24 Mar 2005 15:06:43 -0000 1.3
+++ graph_selectors.hpp 4 Dec 2006 23:23:08 -0000 1.4
@@ -10,6 +10,8 @@
#ifndef BOOST_GRAPH_SELECTORS_HPP
#define BOOST_GRAPH_SELECTORS_HPP
+#include <boost/mpl/bool.hpp>
+
namespace boost {
//===========================================================================
@@ -17,18 +19,18 @@
// and adjacency_matrix.
struct directedS { enum { is_directed = true, is_bidir = false };
- typedef true_type is_directed_t;
- typedef false_type is_bidir_t;
+ typedef mpl::true_ is_directed_t;
+ typedef mpl::false_ is_bidir_t;
};
struct undirectedS {
enum { is_directed = false, is_bidir = false };
- typedef false_type is_directed_t;
- typedef false_type is_bidir_t;
+ typedef mpl::false_ is_directed_t;
+ typedef mpl::false_ is_bidir_t;
};
struct bidirectionalS {
enum { is_directed = true, is_bidir = true };
- typedef true_type is_directed_t;
- typedef true_type is_bidir_t;
+ typedef mpl::true_ is_directed_t;
+ typedef mpl::true_ is_bidir_t;
};
} // namespace boost
Index: johnson_all_pairs_shortest.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/johnson_all_pairs_shortest.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- johnson_all_pairs_shortest.hpp 27 Feb 2006 15:38:17 -0000 1.18
+++ johnson_all_pairs_shortest.hpp 4 Dec 2006 23:23:08 -0000 1.19
@@ -27,7 +27,6 @@
#include <boost/graph/bellman_ford_shortest_paths.hpp>
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/graph/adjacency_list.hpp>
-#include <boost/pending/ct_if.hpp>
#include <boost/type_traits/same_traits.hpp>
namespace boost {
Index: properties.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/properties.hpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- properties.hpp 3 Aug 2006 18:30:26 -0000 1.64
+++ properties.hpp 4 Dec 2006 23:23:08 -0000 1.65
@@ -361,11 +361,11 @@
typedef graph_traits<Graph> traits;
typedef typename Graph::vertex_bundled vertex_bundled;
typedef typename Graph::edge_bundled edge_bundled;
- typedef typename ct_if<(detail::is_vertex_bundle<vertex_bundled,
edge_bundled, Bundle>::value),
+ typedef typename mpl::if_c<(detail::is_vertex_bundle<vertex_bundled,
edge_bundled, Bundle>::value),
typename traits::vertex_descriptor,
typename traits::edge_descriptor>::type
descriptor;
- typedef typename ct_if<(detail::is_vertex_bundle<vertex_bundled,
edge_bundled, Bundle>::value),
+ typedef typename mpl::if_c<(detail::is_vertex_bundle<vertex_bundled,
edge_bundled, Bundle>::value),
vertex_bundled,
edge_bundled>::type
actual_bundle;
Index: property_iter_range.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/property_iter_range.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- property_iter_range.hpp 10 Mar 2006 15:08:31 -0000 1.4
+++ property_iter_range.hpp 4 Dec 2006 23:23:08 -0000 1.5
@@ -20,7 +20,7 @@
#include <boost/property_map_iterator.hpp>
#include <boost/graph/properties.hpp>
-#include <boost/pending/ct_if.hpp>
+#include <boost/mpl/if.hpp>
#include <boost/type_traits/same_traits.hpp>
namespace boost {
@@ -34,7 +34,7 @@
typedef typename property_map<Graph, PropertyTag>::const_type
const_map_type;
typedef typename property_kind<PropertyTag>::type Kind;
- typedef typename ct_if<is_same<Kind, vertex_property_tag>::value,
+ typedef typename mpl::if_c<is_same<Kind, vertex_property_tag>::value,
typename graph_traits<Graph>::vertex_iterator,
typename graph_traits<Graph>::edge_iterator>::type iter;
public:
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
