From fe951bf5a6ebd25ea005ef07b45495243877e1eb Mon Sep 17 00:00:00 2001 From: Jeremy Siek Date: Fri, 3 Nov 2000 04:28:09 +0000 Subject: [PATCH] Codewarrior 6.0 port [SVN r8108] --- examples/bellman_ford.cpp | 2 +- examples/city_visitor.cpp | 2 +- examples/dfs_parenthesis.cpp | 4 ++-- examples/graph.cpp | 2 +- include/boost/graph/detail/adjacency_list.hpp | 8 ++++---- .../boost/graph/detail/connected_components.hpp | 4 ++-- include/boost/graph/stanford_graph.hpp | 16 ++++++++-------- include/boost/graph/visitors.hpp | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/bellman_ford.cpp b/examples/bellman_ford.cpp index 9ad38acb..4f0ea9a4 100644 --- a/examples/bellman_ford.cpp +++ b/examples/bellman_ford.cpp @@ -72,7 +72,7 @@ main(int,char*) 7, 2, 6, 7 }; - typedef boost::edge_list Graph; + typedef boost::edge_list Graph; Graph g(edges, edges + sizeof(edges) / sizeof(E)); std::vector distance(N, std::numeric_limits::max()); diff --git a/examples/city_visitor.cpp b/examples/city_visitor.cpp index 9825dce1..493241d0 100644 --- a/examples/city_visitor.cpp +++ b/examples/city_visitor.cpp @@ -101,7 +101,7 @@ struct finish_city { string* names; }; -int main(int argc, char* argv[]) +int main(int, char*[]) { enum { SanJose, SanFran, LA, SanDiego, Fresno, LosVegas, Reno, diff --git a/examples/dfs_parenthesis.cpp b/examples/dfs_parenthesis.cpp index e57f316b..ed78e8ed 100644 --- a/examples/dfs_parenthesis.cpp +++ b/examples/dfs_parenthesis.cpp @@ -45,14 +45,14 @@ using namespace std; struct open_paren : public base_visitor { typedef on_discover_vertex event_filter; template - void operator()(Vertex v, Graph& G) { + void operator()(Vertex v, Graph&) { std::cout << "(" << v; } }; struct close_paren : public base_visitor { typedef on_finish_vertex event_filter; template - void operator()(Vertex v, Graph& G) { + void operator()(Vertex v, Graph&) { std::cout << v << ")"; } }; diff --git a/examples/graph.cpp b/examples/graph.cpp index 51bc463e..5a29503f 100644 --- a/examples/graph.cpp +++ b/examples/graph.cpp @@ -72,7 +72,7 @@ bool check_edge(Graph& g, size_t a, size_t b) { return true; } -int main(int argc, char* argv[]) +int main(int, char*[]) { size_t N = 5; diff --git a/include/boost/graph/detail/adjacency_list.hpp b/include/boost/graph/detail/adjacency_list.hpp index 7f8be8c9..d3dc8210 100644 --- a/include/boost/graph/detail/adjacency_list.hpp +++ b/include/boost/graph/detail/adjacency_list.hpp @@ -326,16 +326,16 @@ namespace boost { template const typename property_value::type& - get(Tag p, const detail::stored_edge_property& e) { + get(Tag property_tag, const detail::stored_edge_property& e) { typedef typename property_value::type value_type; - return get_property_value(e.get_property(), value_type(), Tag()); + return get_property_value(e.get_property(), value_type(), property_tag); } template const typename property_value::type& - get(Tag p, const detail::stored_edge_iter& e) { + get(Tag property_tag, const detail::stored_edge_iter& e) { typedef typename property_value::type value_type; - return get_property_value(e.get_property(), value_type(), Tag()); + return get_property_value(e.get_property(), value_type(), property_tag); } //========================================================================= diff --git a/include/boost/graph/detail/connected_components.hpp b/include/boost/graph/detail/connected_components.hpp index 61ba572c..3557d922 100644 --- a/include/boost/graph/detail/connected_components.hpp +++ b/include/boost/graph/detail/connected_components.hpp @@ -58,8 +58,8 @@ namespace boost { // Pushes x onto the front of the list. The list is represented in // an array. - template - inline void push_front(Next next, T& head, T x) + template + inline void push_front(Next next, T& head, V x) { T tmp = head; head = x; diff --git a/include/boost/graph/stanford_graph.hpp b/include/boost/graph/stanford_graph.hpp index 74116fe4..666a1b7e 100644 --- a/include/boost/graph/stanford_graph.hpp +++ b/include/boost/graph/stanford_graph.hpp @@ -141,7 +141,7 @@ namespace boost { class sgb_out_edge_iterator : public boost::forward_iterator_helper< sgb_out_edge_iterator, boost::sgb_edge, - ptrdiff_t, boost::sgb_edge*, boost::sgb_edge> + std::ptrdiff_t, boost::sgb_edge*, boost::sgb_edge> { typedef sgb_out_edge_iterator self; public: @@ -158,7 +158,7 @@ namespace boost { class sgb_adj_iterator : public boost::forward_iterator_helper< - sgb_adj_iterator, Vertex*, ptrdiff_t, Vertex**,Vertex*> + sgb_adj_iterator, Vertex*, std::ptrdiff_t, Vertex**,Vertex*> { public: typedef sgb_adj_iterator self; @@ -178,7 +178,7 @@ namespace boost { // by value and how that interacts with the sgb_vertex_id_map. class sgb_vertex_iterator : public boost::forward_iterator_helper< - sgb_vertex_iterator, Vertex*, ptrdiff_t, Vertex**, Vertex*> + sgb_vertex_iterator, Vertex*, std::ptrdiff_t, Vertex**, Vertex*> { public: typedef sgb_vertex_iterator self; @@ -204,7 +204,7 @@ namespace boost { } inline std::pair - out_edges(Vertex* u, Graph* g) + out_edges(Vertex* u, Graph*) { return std::make_pair( sgb_out_edge_iterator(u, u->arcs), sgb_out_edge_iterator(u, 0) ); @@ -213,7 +213,7 @@ namespace boost { // in_edges? inline std::pair - adjacent_vertices(Vertex* u, Graph* g) + adjacent_vertices(Vertex* u, Graph*) { return std::make_pair( sgb_adj_iterator(u->arcs), sgb_adj_iterator(0) ); @@ -263,7 +263,7 @@ namespace boost { typedef Vertex* key_type; inline char* operator[](Vertex* v) const { return v->name; } }; - inline sgb_vertex_name_t_map get(vertex_name_t, Graph* g) { + inline sgb_vertex_name_t_map get(vertex_name_t, Graph*) { return sgb_vertex_name_t_map(); } @@ -373,7 +373,7 @@ namespace boost { } }; inline sgb_edge_length_map - get(edge_length, Graph* g) { + get(edge_length, Graph*) { return sgb_edge_length_map(); } @@ -454,7 +454,7 @@ namespace boost { #define SGB_VERTEX_UTIL_ACCESSOR(TAG,TYPE) \ inline sgb_vertex_util_map< TAG > \ - get(TAG, Graph* g) { \ + get(TAG, Graph*) { \ return sgb_vertex_util_map< TAG >(); \ } \ template <> struct property_map > { \ diff --git a/include/boost/graph/visitors.hpp b/include/boost/graph/visitors.hpp index d101f67a..75262204 100644 --- a/include/boost/graph/visitors.hpp +++ b/include/boost/graph/visitors.hpp @@ -200,7 +200,7 @@ namespace boost { typedef Tag event_filter; time_stamper(TimeMap pa, TimeT& t) : m_time_pa(pa), m_time(t) { } template - void operator()(Vertex u, const Graph& g) { + void operator()(Vertex u, const Graph&) { put(m_time_pa, u, ++m_time); } TimeMap m_time_pa; @@ -224,7 +224,7 @@ namespace boost { property_writer(PA pa, OutputIterator out) : m_pa(pa), m_out(out) { } template - void operator()(T x, Graph& g) { *m_out++ = get(m_pa, x); } + void operator()(T x, Graph&) { *m_out++ = get(m_pa, x); } PA m_pa; OutputIterator m_out; };