diff --git a/plugins/input/ogr/ogr_datasource.cpp b/plugins/input/ogr/ogr_datasource.cpp index ca6602b6b..6a1561211 100644 --- a/plugins/input/ogr/ogr_datasource.cpp +++ b/plugins/input/ogr/ogr_datasource.cpp @@ -372,7 +372,7 @@ boost::optional ogr_datasource::get_geometry_typ // TODO - csv and shapefile inspect first 4 features if (dataset_ && layer_.is_valid()) { - OGRLayer* layer = layer_.layer(); + layer = layer_.layer(); // only new either reset of setNext //layer->ResetReading(); layer->SetNextByIndex(0); @@ -449,11 +449,11 @@ void validate_attribute_names(query const& q, std::vector { std::ostringstream s("OGR Plugin: no attribute '"); s << *pos << "'. Valid attributes are: "; - std::vector::const_iterator itr = names.begin(); - std::vector::const_iterator end = names.end(); - for ( ;itr!=end;++itr) + std::vector::const_iterator e_itr = names.begin(); + std::vector::const_iterator e_end = names.end(); + 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()); }