From 3de7d5123530b80fe991b2e80ab7bb2bb5c1b88b Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Fri, 13 Jan 2012 23:59:50 +0000 Subject: [PATCH] Ignore variables as suggested on the list by Vishnu, to avoid clang warnings [SVN r76477] --- .../geometry/strategies/concepts/area_concept.hpp | 6 +++--- .../strategies/concepts/distance_concept.hpp | 14 +++++++------- .../strategies/concepts/simplify_concept.hpp | 6 +++--- .../strategies/concepts/within_concept.hpp | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/boost/geometry/strategies/concepts/area_concept.hpp b/include/boost/geometry/strategies/concepts/area_concept.hpp index 649949413..75821b52a 100644 --- a/include/boost/geometry/strategies/concepts/area_concept.hpp +++ b/include/boost/geometry/strategies/concepts/area_concept.hpp @@ -44,11 +44,11 @@ class AreaStrategy { static void apply() { - Strategy const* str; - state_type *st; + Strategy const* str = 0; + state_type *st = 0; // 4) must implement a method apply with the following signature - spoint_type const* sp; + spoint_type const* sp = 0; str->apply(*sp, *sp, *st); // 5) must implement a static method result with the following signature diff --git a/include/boost/geometry/strategies/concepts/distance_concept.hpp b/include/boost/geometry/strategies/concepts/distance_concept.hpp index 328b86c2a..ba347d015 100644 --- a/include/boost/geometry/strategies/concepts/distance_concept.hpp +++ b/include/boost/geometry/strategies/concepts/distance_concept.hpp @@ -89,9 +89,9 @@ private : >::type tag; // 7) must implement apply with arguments - Strategy* str; - ptype1 *p1; - ptype2 *p2; + Strategy* str = 0; + ptype1 *p1 = 0; + ptype2 *p2 = 0; rtype r = str->apply(*p1, *p2); // 8) must define (meta)struct "get_similar" with apply @@ -179,10 +179,10 @@ private : ); - Strategy *str; - ptype *p; - sptype *sp1; - sptype *sp2; + Strategy *str = 0; + ptype *p = 0; + sptype *sp1 = 0; + sptype *sp2 = 0; rtype r = str->apply(*p, *sp1, *sp2); diff --git a/include/boost/geometry/strategies/concepts/simplify_concept.hpp b/include/boost/geometry/strategies/concepts/simplify_concept.hpp index f6bf01042..92e5156b5 100644 --- a/include/boost/geometry/strategies/concepts/simplify_concept.hpp +++ b/include/boost/geometry/strategies/concepts/simplify_concept.hpp @@ -79,9 +79,9 @@ private : (concept::PointSegmentDistanceStrategy) ); - Strategy *str; - std::vector const* v1; - std::vector * v2; + Strategy *str = 0; + std::vector const* v1 = 0; + std::vector * v2 = 0; // 2) must implement method apply with arguments // - Range diff --git a/include/boost/geometry/strategies/concepts/within_concept.hpp b/include/boost/geometry/strategies/concepts/within_concept.hpp index fed97d2e4..78b7e538a 100644 --- a/include/boost/geometry/strategies/concepts/within_concept.hpp +++ b/include/boost/geometry/strategies/concepts/within_concept.hpp @@ -152,9 +152,9 @@ class WithinStrategyPointBox // CHECK: calling method apply - Strategy const* str; - point_type const* p; - box_type const* bx; + Strategy const* str = 0; + point_type const* p = 0; + box_type const* bx = 0; bool b = str->apply(*p, *bx); @@ -216,9 +216,9 @@ class WithinStrategyBoxBox // CHECK: calling method apply - Strategy const* str; - box_type1 const* b1; - box_type2 const* b2; + Strategy const* str = 0; + box_type1 const* b1 = 0; + box_type2 const* b2 = 0; bool b = str->apply(*b1, *b2);