update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / graph / test / bidir_vec_remove_edge.cpp

diff --git a/ceph/src/boost/libs/graph/test/bidir_vec_remove_edge.cpp b/ceph/src/boost/libs/graph/test/bidir_vec_remove_edge.cpp
index 732eae708ec4b82834cba72b23883c31722e8dca..ae662b124fec7e13b8609dcdd51f6c5ea4d30f2e 100644 (file)
--- a/ceph/src/boost/libs/graph/test/bidir_vec_remove_edge.cpp
+++ b/ceph/src/boost/libs/graph/test/bidir_vec_remove_edge.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright 2004 Douglas Gregor and Jeremy Siek 
+//  (C) Copyright 2004 Douglas Gregor and Jeremy Siek
 //  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)
@@ -9,49 +9,50 @@
 
 #include <iostream>
 #include <boost/graph/adjacency_list.hpp>
-#include <boost/test/minimal.hpp>
+#include <boost/core/lightweight_test.hpp>
 
-struct edge_prop {
-  int weight;
+struct edge_prop
+{
+    int weight;
 };
 
-int
-test_main(int, char*[])
+int main(int, char*[])
 {
-  {
-    typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::bidirectionalS,
-      boost::no_property, edge_prop, boost::no_property, boost::vecS> graph;
-    typedef boost::graph_traits<graph>::edge_descriptor edge;
-
-    graph g(2);
-
-    edge_prop p1 = { 42 };
-    edge_prop p2 = { 17 };
-    add_edge(0, 1, p1, g);
-    add_edge(1, 0, p2, g);
-    
-    edge e1 = boost::edge(0, 1, g).first;
-    edge e2 = boost::edge(1, 0, g).first;
-    BOOST_CHECK( num_edges(g) == 2 );
-    BOOST_CHECK( g[e1].weight == 42 );
-    BOOST_CHECK( g[e2].weight == 17 );
-    remove_edge(e1, g);
-    BOOST_CHECK( num_edges(g) == 1 );
-
-    // e2 has been invalidated, so grab it again
-    bool b2;
-    boost::tie(e2, b2) = boost::edge(1, 0, g);
-    BOOST_CHECK( b2 );
-    BOOST_CHECK( g[e2].weight == 17 );
-
-    /* Now remove the other edge. Here, the fact that
-     * stored_ra_edge_iterator keeps an index but does not update it
-     * when edges are removed. So, this will be incorrect but the
-     * error may not always show up (use an STL debug mode to see the
-     * error for sure.)
-     */
-    remove_edge(e2, g);
-
-  }
-  return boost::exit_success;
+    {
+        typedef boost::adjacency_list< boost::vecS, boost::vecS,
+            boost::bidirectionalS, boost::no_property, edge_prop,
+            boost::no_property, boost::vecS >
+            graph;
+        typedef boost::graph_traits< graph >::edge_descriptor edge;
+
+        graph g(2);
+
+        edge_prop p1 = { 42 };
+        edge_prop p2 = { 17 };
+        add_edge(0, 1, p1, g);
+        add_edge(1, 0, p2, g);
+
+        edge e1 = boost::edge(0, 1, g).first;
+        edge e2 = boost::edge(1, 0, g).first;
+        BOOST_TEST(num_edges(g) == 2);
+        BOOST_TEST(g[e1].weight == 42);
+        BOOST_TEST(g[e2].weight == 17);
+        remove_edge(e1, g);
+        BOOST_TEST(num_edges(g) == 1);
+
+        // e2 has been invalidated, so grab it again
+        bool b2;
+        boost::tie(e2, b2) = boost::edge(1, 0, g);
+        BOOST_TEST(b2);
+        BOOST_TEST(g[e2].weight == 17);
+
+        /* Now remove the other edge. Here, the fact that
+         * stored_ra_edge_iterator keeps an index but does not update it
+         * when edges are removed. So, this will be incorrect but the
+         * error may not always show up (use an STL debug mode to see the
+         * error for sure.)
+         */
+        remove_edge(e2, g);
+    }
+    return boost::report_errors();
 }