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

c++11 - use auto

Browse source
This commit is contained in:
artemp 2014-09-23 18:49:31 +01:00
parent 5e00bb47bd
commit 4be6ca37e9
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/json/generic_json.hpp
View file

@ -56,7 +56,6 @@ struct generic_json
boost::phoenix::function<detail::value_converter<mapnik::value_double> > double_converter;
};
}}
#endif // MAPNIK_GENERIC_JSON_HPP

15
src/conversions.cpp
View file

@ -33,13 +33,6 @@
#define snprintf _snprintf
#endif
#define BOOST_SPIRIT_AUTO(domain_, name, expr) \
using name##_expr_type = boost::proto::result_of:: \
deep_copy<BOOST_TYPEOF(expr)>::type ; \
BOOST_SPIRIT_ASSERT_MATCH( \
boost::spirit::domain_::domain, name##_expr_type); \
BOOST_AUTO(name, boost::proto::deep_copy(expr)); \
// karma is used by default
#define MAPNIK_KARMA_TO_STRING
@ -53,12 +46,12 @@ namespace util {
using namespace boost::spirit;
BOOST_SPIRIT_AUTO(qi, INTEGER, qi::int_type())
auto INTEGER = qi::int_type();
#ifdef BIGINT
BOOST_SPIRIT_AUTO(qi, LONGLONG, qi::long_long_type())
auto LONGLONG = qi::long_long_type();
#endif
BOOST_SPIRIT_AUTO(qi, FLOAT, qi::float_type())
BOOST_SPIRIT_AUTO(qi, DOUBLE, qi::double_type())
auto FLOAT = qi::float_type();
auto DOUBLE = qi::double_type();
bool string2int(const char * iter, const char * end, int & result)
{