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

+ avoid using static string as datasource name

Browse source
This commit is contained in:
Lucio Asnaghi 2010-11-16 17:54:13 +00:00
parent 76f1de2033
commit 3349cb5823
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/input/postgis/postgis.cpp
View file

@ -322,22 +322,20 @@ void postgis_datasource::bind() const
is_bound_ = true; is_bound_ = true;
} }
std::string const postgis_datasource::name_="postgis";
std::string postgis_datasource::name() std::string postgis_datasource::name()
{ {
return name_; return "postgis";
} }
int postgis_datasource::type() const int postgis_datasource::type() const
{ {
return type_; return type_;
} }
layer_descriptor postgis_datasource::get_descriptor() const layer_descriptor postgis_datasource::get_descriptor() const
{ {
if (!is_bound_) bind(); if (!is_bound_) bind();
return desc_; return desc_;
} }

1
plugins/input/postgis/postgis.hpp
View file

@ -70,7 +70,6 @@ class postgis_datasource : public datasource
mutable layer_descriptor desc_; mutable layer_descriptor desc_;
ConnectionCreator<Connection> creator_; ConnectionCreator<Connection> creator_;
bool multiple_geometries_; bool multiple_geometries_;
static const std::string name_;
const std::string bbox_token_; const std::string bbox_token_;
const std::string scale_denom_token_; const std::string scale_denom_token_;
bool persist_connection_; bool persist_connection_;