Ticket #12555: boost-graph.2.patch

File boost-graph.2.patch, 12.7 KB (added by gromer@…, 6 years ago)

Corrected patch

  • boost/graph/bandwidth.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/bandwidth.hpp boost/graph/bandwidth.hpp
    old new  
    1010#include <algorithm> // for std::min and std::max
    1111#include <boost/config.hpp>
    1212#include <boost/graph/graph_traits.hpp>
     13#include <boost/graph/properties.hpp>
    1314#include <boost/detail/numeric_traits.hpp>
    1415
    1516namespace boost {

  • boost/graph/chrobak_payne_drawing.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/chrobak_payne_drawing.hpp boost/graph/chrobak_payne_drawing.hpp
    old new  
    1414#include <stack>
    1515#include <boost/config.hpp>
    1616#include <boost/graph/graph_traits.hpp>
     17#include <boost/graph/properties.hpp>
    1718#include <boost/property_map/property_map.hpp>
    1819
    1920

  • boost/graph/circle_layout.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/circle_layout.hpp boost/graph/circle_layout.hpp
    old new  
    1414#include <boost/graph/graph_traits.hpp>
    1515#include <boost/graph/iteration_macros.hpp>
    1616#include <boost/graph/topology.hpp>
     17#include <boost/property_map/property_map.hpp>
    1718#include <boost/static_assert.hpp>
    1819
    1920namespace boost {

  • boost/graph/detail/edge.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/detail/edge.hpp boost/graph/detail/edge.hpp
    old new  
    1313
    1414#include <iosfwd>
    1515
     16#include <boost/functional/hash.hpp>
     17
    1618namespace boost {
    1719
    1820  namespace  detail {

  • boost/graph/detail/index.hpp 

    Only in boost/graph/detail: .#index.hpp
diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/detail/index.hpp boost/graph/detail/index.hpp
    old new  
    88#define BOOST_GRAPH_DETAIL_INDEX_HPP
    99
    1010#include <boost/graph/graph_traits.hpp>
     11#include <boost/graph/properties.hpp>
    1112
    1213// The structures in this module are responsible for selecting and defining
    1314// types for accessing a builting index map. Note that the selection of these

  • boost/graph/dimacs.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/dimacs.hpp boost/graph/dimacs.hpp
    old new  
    1818#include <vector>
    1919#include <queue>
    2020#include <boost/assert.hpp>
     21#include <boost/throw_exception.hpp>
    2122
    2223namespace boost { namespace graph {
    2324

  • boost/graph/edge_connectivity.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/edge_connectivity.hpp boost/graph/edge_connectivity.hpp
    old new  
    1616#include <vector>
    1717#include <set>
    1818#include <algorithm>
     19#include <boost/graph/adjacency_list.hpp>
    1920#include <boost/graph/edmonds_karp_max_flow.hpp>
    2021
    2122namespace boost {

  • boost/graph/graph_mutability_traits.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/graph_mutability_traits.hpp boost/graph/graph_mutability_traits.hpp
    old new  
    1111#include <boost/mpl/if.hpp>
    1212#include <boost/mpl/and.hpp>
    1313#include <boost/mpl/bool.hpp>
     14#include <boost/type_traits/is_convertible.hpp>
    1415#include <boost/type_traits/is_same.hpp>
    1516
    1617namespace boost {

  • boost/graph/graph_stats.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/graph_stats.hpp boost/graph/graph_stats.hpp
    old new  
    1111
    1212#include <map>
    1313#include <list>
     14#include <boost/graph/graph_traits.hpp>
    1415#include <boost/graph/iteration_macros.hpp>
     16#include <boost/graph/properties.hpp>
     17#include <boost/tuple/tuple.hpp>
    1518#include <boost/assert.hpp>
    1619
    1720namespace boost { namespace graph {

  • boost/graph/howard_cycle_ratio.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/howard_cycle_ratio.hpp boost/graph/howard_cycle_ratio.hpp
    old new  
    579579    typedef typename remove_const<
    580580        typename property_traits<EdgeWeightMap>::value_type
    581581    >::type Weight;
    582     typename std::vector<Weight> ed_w2(boost::num_edges(g), 1);
     582    typename std::vector<Weight> ed_w2(num_edges(g), 1);
    583583    return maximum_cycle_ratio(g, vim, ewm,
    584584                               make_iterator_property_map(ed_w2.begin(), eim),
    585585                               pcc, ft);
    … …  
    613613    typedef typename remove_const<
    614614        typename property_traits<EdgeWeightMap>::value_type
    615615    >::type Weight;
    616     typename std::vector<Weight> ed_w2(boost::num_edges(g), 1);
     616    typename std::vector<Weight> ed_w2(num_edges(g), 1);
    617617    return minimum_cycle_ratio(g, vim, ewm,
    618618                               make_iterator_property_map(ed_w2.begin(), eim),
    619619                               pcc, ft);

  • boost/graph/labeled_graph.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/labeled_graph.hpp boost/graph/labeled_graph.hpp
    old new  
    1818#include <boost/type_traits/is_same.hpp>
    1919#include <boost/type_traits/is_unsigned.hpp>
    2020#include <boost/pending/container_traits.hpp>
     21#include <boost/graph/adjacency_list.hpp>
    2122#include <boost/graph/graph_traits.hpp>
     23#include <boost/property_map/property_map.hpp>
    2224
    2325// This file implements a utility for creating mappings from arbitrary
    2426// identifiers to the vertices of a graph.

  • boost/graph/metis.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/metis.hpp boost/graph/metis.hpp
    old new  
    2424#include <vector>
    2525#include <algorithm>
    2626
     27#include <boost/throw_exception.hpp>
     28
    2729namespace boost { namespace graph {
    2830
    2931class metis_exception : public std::exception {};

  • boost/graph/planar_canonical_ordering.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/planar_canonical_ordering.hpp boost/graph/planar_canonical_ordering.hpp
    old new  
    1414#include <boost/config.hpp>
    1515#include <boost/next_prior.hpp>
    1616#include <boost/graph/graph_traits.hpp>
     17#include <boost/graph/properties.hpp>
    1718#include <boost/property_map/property_map.hpp>
    1819
    1920

  • boost/graph/point_traits.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/point_traits.hpp boost/graph/point_traits.hpp
    old new  
    99#ifndef BOOST_GRAPH_POINT_TRAITS_HPP
    1010#define BOOST_GRAPH_POINT_TRAITS_HPP
    1111
     12#include <cstddef>
     13
    1214namespace boost { namespace graph {
    1315
    1416template<typename Point>

  • boost/graph/r_c_shortest_paths.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/r_c_shortest_paths.hpp boost/graph/r_c_shortest_paths.hpp
    old new  
    88#ifndef BOOST_GRAPH_R_C_SHORTEST_PATHS_HPP
    99#define BOOST_GRAPH_R_C_SHORTEST_PATHS_HPP
    1010
     11#include <list>
    1112#include <map>
    1213#include <queue>
    1314#include <vector>

  • boost/graph/small_world_generator.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/small_world_generator.hpp boost/graph/small_world_generator.hpp
    old new  
    1111
    1212#include <iterator>
    1313#include <utility>
     14#include <boost/graph/graph_traits.hpp>
    1415#include <boost/random/uniform_01.hpp>
    1516#include <boost/random/uniform_int.hpp>
    1617

  • boost/graph/ssca_graph_generator.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/ssca_graph_generator.hpp boost/graph/ssca_graph_generator.hpp
    old new  
    1515#include <queue>
    1616#include <boost/config.hpp>
    1717#include <boost/random/uniform_int.hpp>
     18#include <boost/random/uniform_01.hpp>
    1819#include <boost/graph/graph_traits.hpp>
    1920#include <boost/type_traits/is_base_and_derived.hpp>
    2021#include <boost/type_traits/is_same.hpp>

  • boost/graph/tree_traits.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/tree_traits.hpp boost/graph/tree_traits.hpp
    old new  
    66#ifndef BOOST_TREE_STRUCTURE_HPP
    77#define BOOST_TREE_STRUCTURE_HPP
    88
     9#include <boost/tuple/tuple.hpp>
     10
    911namespace boost {
    1012
    1113  template <class T>

  • boost/graph/write_dimacs.hpp 

    diff -ur /google/src/files/head/depot/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost/boost/graph/write_dimacs.hpp boost/graph/write_dimacs.hpp
    old new  
    4141#include <string>
    4242#include <ostream>
    4343
     44#include <boost/graph/graph_traits.hpp>
     45#include <boost/tuple/tuple.hpp>
     46
    4447namespace boost {
    4548
    4649template <class Graph, class CapacityMap, class IndexMap>