sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid -Wshadow and 'unrecognized command line option' with gcc

Browse source
This commit is contained in:
Dane Springmeyer 2016-11-29 13:50:08 -08:00
parent b2f7bea7b5
commit 4cd55330dd
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/mapnik/offset_converter.hpp
View file

@ -77,18 +77,18 @@ struct offset_converter
return threshold_;
}
void set_offset(double value)
void set_offset(double val)
{
if (offset_ != value)
if (offset_ != val)
{
offset_ = value;
offset_ = val;
reset();
}
}
void set_threshold(double value)
void set_threshold(double val)
{
threshold_ = value;
threshold_ = val;
// no need to reset(), since threshold doesn't affect
// offset vertices' computation, it only controls how
// far will we be looking for self-intersections

12
include/mapnik/simplify_converter.hpp
View file

@ -120,11 +120,11 @@ public:
return algorithm_;
}
void set_simplify_algorithm(simplify_algorithm_e value)
void set_simplify_algorithm(simplify_algorithm_e val)
{
if (algorithm_ != value)
if (algorithm_ != val)
{
algorithm_ = value;
algorithm_ = val;
reset();
}
}
@ -134,11 +134,11 @@ public:
return tolerance_;
}
void set_simplify_tolerance(double value)
void set_simplify_tolerance(double val)
{
if (tolerance_ != value)
if (tolerance_ != val)
{
tolerance_ = value;
tolerance_ = val;
reset();
}
}

4
scripts/travis-common.sh
View file

@ -83,9 +83,9 @@ config_override () {
configure () {
if enabled ${COVERAGE}; then
./configure "$@" PREFIX=${PREFIX} PGSQL2SQLITE=False SVG2PNG=False SVG_RENDERER=False \
COVERAGE=True DEBUG=True WARNING_CXXFLAGS="-Wno-unknown-warning-option"
COVERAGE=True DEBUG=True
else
./configure "$@" PREFIX=${PREFIX} WARNING_CXXFLAGS="-Wno-unknown-warning-option"
./configure "$@" PREFIX=${PREFIX}
fi
# print final config values, sorted and indented
sort -sk1,1 ./config.py | sed -e 's/^/ /'