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

fix -Wshadow warning

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-03 18:00:28 -08:00
parent ebfc3161c1
commit 771e2f3d8e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/input/ogr/ogr_datasource.cpp
View file

@ -372,7 +372,7 @@ boost::optional<mapnik::datasource::geometry_t> ogr_datasource::get_geometry_typ
// TODO - csv and shapefile inspect first 4 features // TODO - csv and shapefile inspect first 4 features
if (dataset_ && layer_.is_valid()) if (dataset_ && layer_.is_valid())
{ {
OGRLayer* layer = layer_.layer(); layer = layer_.layer();
// only new either reset of setNext // only new either reset of setNext
//layer->ResetReading(); //layer->ResetReading();
layer->SetNextByIndex(0); layer->SetNextByIndex(0);
@ -449,11 +449,11 @@ void validate_attribute_names(query const& q, std::vector<attribute_descriptor>
{ {
std::ostringstream s("OGR Plugin: no attribute '"); std::ostringstream s("OGR Plugin: no attribute '");
s << *pos << "'. Valid attributes are: "; s << *pos << "'. Valid attributes are: ";
std::vector<attribute_descriptor>::const_iterator itr = names.begin(); std::vector<attribute_descriptor>::const_iterator e_itr = names.begin();
std::vector<attribute_descriptor>::const_iterator end = names.end(); std::vector<attribute_descriptor>::const_iterator e_end = names.end();
for ( ;itr!=end;++itr) for ( ;e_itr!=e_end;++e_itr)
{ {
s << itr->get_name() << std::endl; s << e_itr->get_name() << std::endl;
} }
throw mapnik::datasource_exception(s.str()); throw mapnik::datasource_exception(s.str());
} }