Update of /cvsroot/boost/boost/boost/graph
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19125
Modified Files:
graph_concepts.hpp
Log Message:
Fix locations of default constructors
Index: graph_concepts.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/graph_concepts.hpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- graph_concepts.hpp 27 Jun 2006 15:01:14 -0000 1.44
+++ graph_concepts.hpp 28 Jun 2006 20:00:27 -0000 1.45
@@ -57,21 +57,18 @@
typedef typename graph_traits<G>::traversal_category
traversal_category;
-
+
+#if BOOST_WORKAROUND(__GNUC__, <= 3)
+ Graph(); // at least 2.96 and 3.4.3 both need this :(
+#endif
+
~Graph()
{
BOOST_CONCEPT_ASSERT((DefaultConstructible<vertex_descriptor>));
-#if BOOST_WORKAROUND(__GNUC__, <= 3)
- IncidenceGraph(); // at least 2.96 and 3.4.3 both need this :(
-#endif
BOOST_CONCEPT_ASSERT((EqualityComparable<vertex_descriptor>));
BOOST_CONCEPT_ASSERT((Assignable<vertex_descriptor>));
}
- G g;
-
-#if BOOST_WORKAROUND(__GNUC__, <= 3)
- Graph(); // at least 2.96 and 3.4.3 both need this :(
-#endif
+ G g;
};
BOOST_concept(IncidenceGraph,(G))
@@ -83,7 +80,11 @@
typedef typename graph_traits<G>::traversal_category
traversal_category;
-
+
+#if BOOST_WORKAROUND(__GNUC__, <= 3)
+ IncidenceGraph(); // at least 2.96 and 3.4.3 both need this :(
+#endif
+
~IncidenceGraph() {
BOOST_CONCEPT_ASSERT((MultiPassInputIterator<out_edge_iterator>));
BOOST_CONCEPT_ASSERT((DefaultConstructible<edge_descriptor>));
@@ -100,9 +101,6 @@
const_constraints(g);
}
void const_constraints(const G& cg) {
-#if BOOST_WORKAROUND(__GNUC__, <= 3)
- BidirectionalGraph(); // at least 2.96 and 3.4.3 both need this :(
-#endif
p = out_edges(u, cg);
n = out_degree(u, cg);
e = *p.first;
@@ -123,6 +121,11 @@
in_edge_iterator;
typedef typename graph_traits<G>::traversal_category
traversal_category;
+
+#if BOOST_WORKAROUND(__GNUC__, <= 3)
+ BidirectionalGraph(); // at least 2.96 and 3.4.3 both need this :(
+#endif
+
~BidirectionalGraph() {
BOOST_CONCEPT_ASSERT((MultiPassInputIterator<in_edge_iterator>));
BOOST_CONCEPT_ASSERT((Convertible<traversal_category,
@@ -132,9 +135,6 @@
n = in_degree(v, g);
e = *p.first;
const_constraints(g);
-#if BOOST_WORKAROUND(__GNUC__, <= 3)
- AdjacencyGraph(); // at least 2.96 and 3.4.3 both need this :(
-#endif
}
void const_constraints(const G& cg) {
p = in_edges(v, cg);
@@ -155,6 +155,11 @@
adjacency_iterator;
typedef typename graph_traits<G>::traversal_category
traversal_category;
+
+#if BOOST_WORKAROUND(__GNUC__, <= 3)
+ AdjacencyGraph(); // at least 2.96 and 3.4.3 both need this :(
+#endif
+
~AdjacencyGraph() {
BOOST_CONCEPT_ASSERT((MultiPassInputIterator<adjacency_iterator>));
BOOST_CONCEPT_ASSERT((Convertible<traversal_category,
@@ -178,10 +183,10 @@
typedef typename graph_traits<G>::vertex_iterator vertex_iterator;
typedef typename graph_traits<G>::vertices_size_type vertices_size_type;
typedef typename graph_traits<G>::traversal_category
+ traversal_category;
#if BOOST_WORKAROUND(__GNUC__, <= 3)
VertexListGraph(); // at least 2.96 and 3.4.3 both need this :(
#endif
- traversal_category;
~VertexListGraph() {
BOOST_CONCEPT_ASSERT((MultiPassInputIterator<vertex_iterator>));
BOOST_CONCEPT_ASSERT((Convertible<traversal_category,
@@ -226,10 +231,10 @@
typedef typename graph_traits<G>::edge_iterator edge_iterator;
typedef typename graph_traits<G>::edges_size_type edges_size_type;
typedef typename graph_traits<G>::traversal_category
+ traversal_category;
#if BOOST_WORKAROUND(__GNUC__, <= 3)
EdgeListGraph(); // at least 2.96 and 3.4.3 both need this :(
#endif
- traversal_category;
~EdgeListGraph() {
BOOST_CONCEPT_ASSERT((MultiPassInputIterator<edge_iterator>));
BOOST_CONCEPT_ASSERT((DefaultConstructible<edge_descriptor>));
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
