archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

Minimal roll back const changes

Browse Source 
Changes to expression_ptr and path_expression_ptr are causing runtime issues with the python bindings
This commit is contained in:
Colin Rundel 2012-08-29 15:35:48 -04:00
parent dc3763885c
commit bd5df80f75
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mapnik/expression.hpp
View File

@ -34,7 +34,7 @@
namespace mapnik
{
typedef boost::shared_ptr<const expr_node> expression_ptr;
typedef boost::shared_ptr<expr_node> expression_ptr;
MAPNIK_DECL expression_ptr parse_expression (std::string const& wkt, std::string const& encoding = "UTF8");

2
include/mapnik/parse_path.hpp
View File

@ -41,7 +41,7 @@
namespace mapnik {
typedef boost::shared_ptr<const path_expression> path_expression_ptr;
typedef boost::shared_ptr<path_expression> path_expression_ptr;
MAPNIK_DECL path_expression_ptr parse_path(std::string const & str);
MAPNIK_DECL path_expression_ptr parse_path(std::string const & str,

2
src/expression.cpp
View File

@ -52,7 +52,7 @@ expression_ptr parse_expression(std::string const& str,
bool r = boost::spirit::qi::phrase_parse(itr, end, g, boost::spirit::standard_wide::space, node);
if (r && itr==end)
{
return boost::make_shared<const expr_node>(node);
return boost::make_shared<expr_node>(node);
}
else
{

2
src/parse_path.cpp
View File

@ -43,7 +43,7 @@ path_expression_ptr parse_path(std::string const& str,
bool r = qi::phrase_parse(itr, end, g, boost::spirit::standard_wide::space, path);
if (r && itr == end)
{
return boost::make_shared<const path_expression>(path); //path;
return boost::make_shared<path_expression>(path); //path;
}
else
{