From 7e8af8bbf91329f9d1ff9b33391dec352e099bc0 Mon Sep 17 00:00:00 2001
From: Franz Detro <franz.detro@native-instruments.de>
Date: Tue, 4 Sep 2012 14:53:12 +0200
Subject: [PATCH] fix warnings in boost graph
---
boost/graph/compressed_sparse_row_graph.hpp | 2 +-
boost/graph/detail/indexed_properties.hpp | 4 ++--
boost/graph/detail/set_adaptor.hpp | 2 +-
boost/graph/named_function_params.hpp | 10 +++++-----
boost/graph/named_graph.hpp | 2 +-
boost/graph/reverse_graph.hpp | 8 ++++----
boost/graph/visitors.hpp | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/boost/graph/compressed_sparse_row_graph.hpp b/boost/graph/compressed_sparse_row_graph.hpp
index 59e8bb4..42e2419 100644
a
|
b
|
namespace detail {
|
136 | 136 | typedef boost::iterator_facade<default_construct_iterator<T>, T, std::random_access_iterator_tag, const T&> base_type; |
137 | 137 | T saved_value; |
138 | 138 | const T& dereference() const {return saved_value;} |
139 | | bool equal(default_construct_iterator i) const {return true;} |
| 139 | bool equal(default_construct_iterator /*i*/) const {return true;} |
140 | 140 | void increment() {} |
141 | 141 | void decrement() {} |
142 | 142 | void advance(typename base_type::difference_type) {} |
diff --git a/boost/graph/detail/indexed_properties.hpp b/boost/graph/detail/indexed_properties.hpp
index e1f874b..4494625 100644
a
|
b
|
class indexed_edge_properties<Derived, void, Descriptor, IndexMap>
|
253 | 253 | typedef secret const_edge_map_type; |
254 | 254 | |
255 | 255 | secret operator[](secret) { return secret(); } |
256 | | void write_by_index(std::size_t idx, const no_property& prop) {} |
| 256 | void write_by_index(std::size_t /*idx*/, const no_property& /*prop*/) {} |
257 | 257 | |
258 | 258 | edge_map_type get_edge_bundle(const IndexMap& = IndexMap()) const { |
259 | 259 | return edge_map_type(); |
… |
… |
class indexed_edge_properties<Derived, void, Descriptor, IndexMap>
|
270 | 270 | |
271 | 271 | public: |
272 | 272 | void push_back(const edge_push_back_type&) { } |
273 | | void move_range(std::size_t src_begin, std::size_t src_end, std::size_t dest_begin) {} |
| 273 | void move_range(std::size_t /*src_begin*/, std::size_t /*src_end*/, std::size_t /*dest_begin*/) {} |
274 | 274 | |
275 | 275 | typedef dummy_no_property_iterator iterator; |
276 | 276 | iterator begin() {return dummy_no_property_iterator();} |
diff --git a/boost/graph/detail/set_adaptor.hpp b/boost/graph/detail/set_adaptor.hpp
index 90a64a2..33acc07 100644
a
|
b
|
namespace boost {
|
111 | 111 | // Shit, can't implement this without knowing the size of the |
112 | 112 | // universe. |
113 | 113 | template <class K, class C, class A> |
114 | | void set_compliment(const std::set<K,C,A>& x, |
| 114 | void set_compliment(const std::set<K,C,A>& /*x*/, |
115 | 115 | std::set<K,C,A>& z) |
116 | 116 | { |
117 | 117 | z.clear(); |
diff --git a/boost/graph/named_function_params.hpp b/boost/graph/named_function_params.hpp
index 32dd580..94314a6 100644
a
|
b
|
BOOST_BGL_DECLARE_NAMED_PARAMS
|
432 | 432 | template <typename ArgType, typename Prop, typename Graph, bool Exists> |
433 | 433 | struct override_property_t { |
434 | 434 | typedef ArgType result_type; |
435 | | result_type operator()(const Graph& g, const typename boost::add_reference<ArgType>::type a) const {return a;} |
| 435 | result_type operator()(const Graph&, const typename boost::add_reference<ArgType>::type a) const {return a;} |
436 | 436 | }; |
437 | 437 | |
438 | 438 | template <typename ArgType, typename Prop, typename Graph> |
439 | 439 | struct override_property_t<ArgType, Prop, Graph, false> { |
440 | 440 | typedef typename boost::property_map<Graph, Prop>::type result_type; |
441 | | result_type operator()(const Graph& g, const ArgType& a) const {return get(Prop(), g);} |
| 441 | result_type operator()(const Graph& g, const ArgType&) const {return get(Prop(), g);} |
442 | 442 | }; |
443 | 443 | |
444 | 444 | template <typename ArgPack, typename Tag, typename Prop, typename Graph> |
… |
… |
BOOST_BGL_DECLARE_NAMED_PARAMS
|
455 | 455 | |
456 | 456 | template <typename ArgPack, typename Tag, typename Prop, typename Graph> |
457 | 457 | typename override_property_result<ArgPack, Tag, Prop, Graph>::type |
458 | | override_property(const ArgPack& ap, const boost::parameter::keyword<Tag>& t, const Graph& g, Prop prop) { |
| 458 | override_property(const ArgPack& ap, const boost::parameter::keyword<Tag>& t, const Graph& g, Prop) { |
459 | 459 | return override_property_t< |
460 | 460 | typename boost::parameter::value_type<ArgPack, Tag, int>::type, |
461 | 461 | Prop, |
… |
… |
BOOST_BGL_DECLARE_NAMED_PARAMS
|
633 | 633 | typedef Q priority_queue_type; |
634 | 634 | |
635 | 635 | static priority_queue_type |
636 | | make_queue(const Graph& g, const ArgPack& ap, KeyT defaultKey, const Q& q) { |
| 636 | make_queue(const Graph&, const ArgPack&, KeyT, const Q& q) { |
637 | 637 | return q; |
638 | 638 | } |
639 | 639 | }; |
… |
… |
BOOST_BGL_DECLARE_NAMED_PARAMS
|
645 | 645 | typedef boost::d_ary_heap_indirect<ValueT, 4, index_in_heap_map, typename map_maker<Graph, ArgPack, KeyMapTag, KeyT>::helper::map_type, Compare> priority_queue_type; |
646 | 646 | |
647 | 647 | static priority_queue_type |
648 | | make_queue(const Graph& g, const ArgPack& ap, KeyT defaultKey, const Q& q) { |
| 648 | make_queue(const Graph& g, const ArgPack& ap, KeyT defaultKey, const Q&) { |
649 | 649 | return priority_queue_type( |
650 | 650 | map_maker<Graph, ArgPack, KeyMapTag, KeyT>::make_map(g, ap, defaultKey), |
651 | 651 | map_maker<Graph, ArgPack, IndexInHeapMapTag, default_index_in_heap_type>::make_map(g, ap, typename boost::property_traits<index_in_heap_map>::value_type(-1)) |
diff --git a/boost/graph/named_graph.hpp b/boost/graph/named_graph.hpp
index f49c097..77e1a22 100644
a
|
b
|
public:
|
105 | 105 | typedef vertex_name_type argument_type; |
106 | 106 | typedef VertexProperty result_type; |
107 | 107 | |
108 | | VertexProperty operator()(const vertex_name_type& name) |
| 108 | VertexProperty operator()(const vertex_name_type&) |
109 | 109 | { |
110 | 110 | boost::throw_exception(std::runtime_error("add_vertex: " |
111 | 111 | "unable to create a vertex from its name")); |
diff --git a/boost/graph/reverse_graph.hpp b/boost/graph/reverse_graph.hpp
index 96fc32d..bea975a 100644
a
|
b
|
template <class G>
|
460 | 460 | typename enable_if<is_reverse_graph<G>, |
461 | 461 | detail::underlying_edge_desc_map_type<typename graph_traits<typename G::base_type>::edge_descriptor> >::type |
462 | 462 | get(edge_underlying_t, |
463 | | G& g) |
| 463 | G&) |
464 | 464 | { |
465 | 465 | return detail::underlying_edge_desc_map_type<typename graph_traits<typename G::base_type>::edge_descriptor>(); |
466 | 466 | } |
… |
… |
get(edge_underlying_t,
|
468 | 468 | template <class G> |
469 | 469 | typename enable_if<is_reverse_graph<G>, typename graph_traits<typename G::base_type>::edge_descriptor>::type |
470 | 470 | get(edge_underlying_t, |
471 | | G& g, |
| 471 | G&, |
472 | 472 | const typename graph_traits<G>::edge_descriptor& k) |
473 | 473 | { |
474 | 474 | return k.underlying_descx; |
… |
… |
get(edge_underlying_t,
|
477 | 477 | template <class G> |
478 | 478 | typename enable_if<is_reverse_graph<G>, detail::underlying_edge_desc_map_type<typename graph_traits<typename G::base_type>::edge_descriptor> >::type |
479 | 479 | get(edge_underlying_t, |
480 | | const G& g) |
| 480 | const G&) |
481 | 481 | { |
482 | 482 | return detail::underlying_edge_desc_map_type<typename graph_traits<typename G::base_type>::edge_descriptor>(); |
483 | 483 | } |
… |
… |
get(edge_underlying_t,
|
485 | 485 | template <class G> |
486 | 486 | typename enable_if<is_reverse_graph<G>, typename graph_traits<typename G::base_type>::edge_descriptor>::type |
487 | 487 | get(edge_underlying_t, |
488 | | const G& g, |
| 488 | const G&, |
489 | 489 | const typename graph_traits<G>::edge_descriptor& k) |
490 | 490 | { |
491 | 491 | return k.underlying_descx; |
diff --git a/boost/graph/visitors.hpp b/boost/graph/visitors.hpp
index f986c96..d10e140 100644
a
|
b
|
namespace boost {
|
269 | 269 | {} |
270 | 270 | |
271 | 271 | template <typename VertexOrEdge, typename Graph> |
272 | | void operator() (VertexOrEdge v, const Graph& g) |
| 272 | void operator() (VertexOrEdge v, const Graph&) |
273 | 273 | { |
274 | 274 | put (property_map_, v, value_); |
275 | 275 | } |
… |
… |
namespace boost {
|
292 | 292 | inline property_put <PropertyMap, EventTag> |
293 | 293 | put_property (PropertyMap property_map, |
294 | 294 | typename property_traits <PropertyMap>::value_type value, |
295 | | EventTag tag) |
| 295 | EventTag) |
296 | 296 | { |
297 | 297 | return property_put <PropertyMap, EventTag> (property_map, value); |
298 | 298 | } |