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

gcc4.0.1 doesn't like volatile locals?

Browse source
This commit is contained in:
Artem Pavlenko 2005-08-31 19:30:54 +00:00
parent c10aab1e94
commit b20007b440
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/layer.cpp
View file

@ -41,8 +41,9 @@ namespace mapnik
try
{
name_=params_.get("name");
volatile datasource_cache* factory=datasource_cache::instance();
ds_=factory->create(params_);
//volatile datasource_cache* factory=datasource_cache::instance();
//ds_=factory->create(params_);
ds_=datasource_cache::instance()->create(params_);
}
catch (...)

10
src/render.cpp
View file

@ -49,14 +49,14 @@ namespace mapnik
const datasource_p& ds=l.datasource();
if (!ds) return;
volatile named_style_cache* styles=named_style_cache::instance();
//volatile named_style_cache* styles=named_style_cache::instance();
//get copy
std::vector<std::string> const& namedStyles=l.styles();
std::vector<std::string>::const_iterator stylesIter=namedStyles.begin();
while (stylesIter!=namedStyles.end())
{
feature_type_style style=styles->find(*stylesIter++);
feature_type_style style=named_style_cache::instance()->find(*stylesIter++);
std::set<std::string> names;
attribute_collector<Feature> collector(names);
@ -105,7 +105,7 @@ namespace mapnik
if (fs)
{
Feature* feature=0;
while (feature = fs->next())
while ((feature = fs->next()))
{
bool do_else=true;
geometry_ptr& geom=feature->get_geometry();
@ -153,8 +153,8 @@ namespace mapnik
}
if (l.isSelectable() && l.selection().size()) //TODO !!!
{
volatile style_cache* styles=style_cache::instance();
const Style& style=styles->find(l.selection_style());
//volatile style_cache* styles=style_cache::instance();
const Style& style=style_cache::instance()->find(l.selection_style());
std::vector<ref_ptr<Feature> >& selection=l.selection();