Update of /cvsroot/boost/boost/boost/graph/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6788/detail
Modified Files:
adjacency_list.hpp bitset.hpp is_same.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/detail/adjacency_list.hpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- adjacency_list.hpp 21 Sep 2006 17:02:14 -0000 1.140
+++ adjacency_list.hpp 4 Dec 2006 23:23:08 -0000 1.141
@@ -24,7 +24,9 @@
#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/pending/ct_if.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/not.hpp>
+#include <boost/mpl/and.hpp>
#include <boost/graph/graph_concepts.hpp>
#include <boost/pending/container_traits.hpp>
#include <boost/graph/detail/adj_list_edge_iterator.hpp>
@@ -2273,7 +2275,7 @@
typedef typename container_gen<VertexListS,
vertex_ptr>::type SeqVertexList;
typedef boost::integer_range<std::size_t> RandVertexList;
- typedef typename boost::ct_if_t<is_rand_access,
+ typedef typename mpl::if_<is_rand_access,
RandVertexList, SeqVertexList>::type VertexList;
typedef typename VertexList::iterator vertex_iterator;
@@ -2283,10 +2285,10 @@
typedef typename container_gen<EdgeListS,
list_edge<vertex_descriptor, EdgeProperty> >::type EdgeContainer;
- 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;
- 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;
@@ -2294,9 +2296,9 @@
typedef typename detail::is_random_access<EdgeListS>::type is_edge_ra;
- typedef typename boost::ct_if_t<on_edge_storage,
+ typedef typename mpl::if_<on_edge_storage,
stored_edge_property<vertex_descriptor, EdgeProperty>,
- typename boost::ct_if_t<is_edge_ra,
+ typename mpl::if_<is_edge_ra,
stored_ra_edge_iter<vertex_descriptor, EdgeContainer,
EdgeProperty>,
stored_edge_iter<vertex_descriptor, EdgeIter, EdgeProperty>
>::type
@@ -2347,7 +2349,7 @@
typedef adj_list_edge_iterator<vertex_iterator, out_edge_iterator,
graph_type> DirectedEdgeIter;
- typedef typename boost::ct_if_t<on_edge_storage,
+ typedef typename mpl::if_<on_edge_storage,
DirectedEdgeIter, UndirectedEdgeIter>::type edge_iterator;
// stored_vertex and StoredVertexList
@@ -2381,10 +2383,10 @@
InEdgeList m_in_edges;
VertexProperty m_property;
};
- typedef typename boost::ct_if_t<is_rand_access,
- typename boost::ct_if_t<BidirectionalT,
+ typedef typename mpl::if_<is_rand_access,
+ typename mpl::if_<BidirectionalT,
bidir_rand_stored_vertex, rand_stored_vertex>::type,
- typename boost::ct_if_t<BidirectionalT,
+ typename mpl::if_<BidirectionalT,
bidir_seq_stored_vertex, seq_stored_vertex>::type
>::type StoredVertex;
struct stored_vertex : public StoredVertex {
@@ -2394,20 +2396,20 @@
typedef typename container_gen<VertexListS, stored_vertex>::type
RandStoredVertexList;
- typedef typename boost::ct_if_t< is_rand_access,
+ typedef typename mpl::if_< is_rand_access,
RandStoredVertexList, SeqStoredVertexList>::type StoredVertexList;
}; // end of config
- typedef typename boost::ct_if_t<BidirectionalT,
+ typedef typename mpl::if_<BidirectionalT,
bidirectional_graph_helper_with_property<config>,
- typename boost::ct_if_t<DirectedT,
+ typename mpl::if_<DirectedT,
directed_graph_helper<config>,
undirected_graph_helper<config>
>::type
>::type DirectedHelper;
- typedef typename boost::ct_if_t<is_rand_access,
+ typedef typename mpl::if_<is_rand_access,
vec_adj_list_impl<Graph, config, DirectedHelper>,
adj_list_impl<Graph, config, DirectedHelper>
>::type type;
Index: bitset.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/detail/bitset.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- bitset.hpp 6 Feb 2006 22:12:57 -0000 1.10
+++ bitset.hpp 4 Dec 2006 23:23:08 -0000 1.11
@@ -26,7 +26,7 @@
#include <algorithm>
#include <string>
#include <boost/config.hpp>
-#include <boost/pending/ct_if.hpp>
+#include <boost/mpl/if.hpp>
#include <boost/graph/detail/bitset_adaptor.hpp>
// This provides versions of std::bitset with both static and dynamic size.
@@ -594,7 +594,7 @@
typename Allocator = std::allocator<WordType>
>
class bitset_generator {
- typedef typename ct_if<N, select_dyn_size_bitset,
+ typedef typename mpl::if_c<N, select_dyn_size_bitset,
select_static_bitset>::type selector;
public:
typedef typename selector
Index: is_same.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/detail/is_same.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- is_same.hpp 24 Mar 2005 14:54:09 -0000 1.5
+++ is_same.hpp 4 Dec 2006 23:23:08 -0000 1.6
@@ -9,7 +9,7 @@
#ifndef BOOST_GRAPH_DETAIL_IS_SAME_HPP
#define BOOST_GRAPH_DETAIL_IS_SAME_HPP
-#include <boost/pending/ct_if.hpp>
+#include <boost/mpl/if.hpp>
namespace boost {
struct false_tag;
@@ -30,7 +30,7 @@
template <class U, class V>
struct is_same {
enum { Unum = U::num, Vnum = V::num };
- typedef typename boost::ct_if< (Unum == Vnum),
+ typedef typename mpl::if_c< (Unum == Vnum),
boost::true_tag, boost::false_tag>::type is_same_tag;
};
#endif
-------------------------------------------------------------------------
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
