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

c++14 support is not sufficient on windows: reverting back and start tracking Windows workarounds in separate branch

Browse source 
Revert "move BOOST_SPIRIT_DEFINE into separate headers + use across all grammar defs (#3573)"

This reverts commit 81cfa721db.

Revert "windows : fix errors C3259 + C3249"

This reverts commit 8327905aba.

Revert "Workaround for VC++ C2995 via redifining BOOST_SPIRIT_DEFINE macro (#3573)"

This reverts commit 2a2f0bf00a.
This commit is contained in:
artemp 2016-12-14 17:07:34 +01:00
parent 81cfa721db
commit 4ba87b1e9d
17 changed files with 5 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/css_color_grammar_x3_def.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/css_color_grammar_x3.hpp>
#include <mapnik/util/hsl.hpp>
#include <mapnik/safe_cast.hpp>
#include <mapnik/util/windows_c2995.hpp>
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp>

1
include/mapnik/csv/csv_grammar_x3_def.hpp
View file

@ -20,7 +20,6 @@
*
*****************************************************************************/
#include <mapnik/util/windows_c2995.hpp>
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#include <mapnik/csv/csv_grammar_x3.hpp>

1
include/mapnik/expression_grammar_x3_def.hpp
View file

@ -23,7 +23,6 @@
#ifndef MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
#define MAPNIK_EXPRESSIONS_GRAMMAR_X3_DEF_HPP
#include <mapnik/util/windows_c2995.hpp>
#include <mapnik/expression_grammar_x3.hpp>
#include <mapnik/expression_node.hpp>
#include <mapnik/function_call.hpp>

2
include/mapnik/image_filter_grammar_x3_def.hpp
View file

@ -23,10 +23,10 @@
#ifndef MAPNIK_IMAGE_FILTER_GRAMMAR_X3_DEF_HPP
#define MAPNIK_IMAGE_FILTER_GRAMMAR_X3_DEF_HPP
#include <mapnik/image_filter_grammar_x3.hpp>
#include <mapnik/image_filter_types.hpp>
#include <mapnik/css_color_grammar_x3.hpp>
#include <mapnik/util/windows_c2995.hpp>
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>

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

@ -32,7 +32,6 @@
#include <mapnik/json/create_geometry.hpp>
#include <mapnik/util/conversions.hpp>
#include <mapnik/util/windows_c2995.hpp>
#include <mapnik/value.hpp>
#include <mapnik/geometry/geometry_types.hpp>

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

@ -26,7 +26,6 @@
#include <boost/fusion/include/std_pair.hpp>
#include <mapnik/json/generic_json_grammar_x3.hpp>
#include <mapnik/json/unicode_string_grammar_x3.hpp>
#include <mapnik/util/windows_c2995.hpp>
namespace mapnik { namespace json { namespace grammar {

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

@ -27,7 +27,6 @@
#include <mapnik/json/geojson_grammar_x3.hpp>
#include <mapnik/json/unicode_string_grammar_x3.hpp>
#include <mapnik/json/positions_grammar_x3.hpp>
#include <mapnik/util/windows_c2995.hpp>
#include <boost/fusion/include/std_pair.hpp>
namespace mapnik { namespace json { namespace grammar {

16
include/mapnik/json/json_grammar_config.hpp
View file

@ -46,21 +46,6 @@ enum well_known_names
properties
};
#ifdef _WINDOWS
char const* wkn_to_string(well_known_names val)
{
switch(val)
{
case id: return "id";
case type: return "type";
case features: return "features";
case geometry: return "geometry";
case coordinates: return "coordinates";
case properties: return "properties";
default: return "unknown";
}
}
#else
constexpr char const* wkn_to_string(well_known_names val)
{
switch(val)
@ -74,7 +59,6 @@ constexpr char const* wkn_to_string(well_known_names val)
default: return "unknown";
}
}
#endif
using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>,

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

@ -25,7 +25,6 @@
#include <mapnik/json/positions_grammar_x3.hpp>
#include <mapnik/geometry/fusion_adapted.hpp>
#include <mapnik/util/windows_c2995.hpp>
namespace mapnik { namespace json { namespace grammar {

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

@ -24,7 +24,6 @@
#define MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_DEF_HPP
#include <mapnik/json/unicode_string_grammar_x3.hpp>
#include <mapnik/util/windows_c2995.hpp>
#include <iostream>
namespace mapnik { namespace json { namespace grammar {

1
include/mapnik/path_expression_grammar_x3_def.hpp
View file

@ -25,7 +25,6 @@
// mapnik
#include <mapnik/path_expression_grammar_x3.hpp>
#include <mapnik/attribute.hpp>
#include <mapnik/util/windows_c2995.hpp>
namespace mapnik { namespace grammar {

1
include/mapnik/transform_expression_grammar_x3_def.hpp
View file

@ -26,7 +26,6 @@
#include <mapnik/transform_expression.hpp>
#include <mapnik/transform_expression_grammar_x3.hpp>
#include <mapnik/expression_grammar_x3.hpp>
#include <mapnik/util/windows_c2995.hpp>
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>

51
include/mapnik/util/windows_c2995.hpp
View file

@ -1,51 +0,0 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2016 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#ifndef MAPNIK_UTIL_WINDOWS_C2995_HPP
#define MAPNIK_UTIL_WINDOWS_C2995_HPP
#ifdef _WINDOWS
// VC++ C2995 fix
#undef BOOST_SPIRIT_DEFINE_
#undef BOOST_SPIRIT_DEFINE
#define BOOST_SPIRIT_DEFINE_(r, data, rule_name) \
using BOOST_PP_CAT(rule_name, _synonym) = decltype(rule_name); \
template <typename Iterator, typename Context, typename Attribute> \
inline bool parse_rule( \
BOOST_PP_CAT(rule_name, _synonym) rule_ \
, Iterator& first, Iterator const& last \
, Context const& context, Attribute& attr) \
{ \
using boost::spirit::x3::unused; \
static auto const def_ = (rule_name = BOOST_PP_CAT(rule_name, _def)); \
return def_.parse(first, last, context, unused, attr); \
} \
/***/
#define BOOST_SPIRIT_DEFINE(...) BOOST_PP_SEQ_FOR_EACH( \
BOOST_SPIRIT_DEFINE_, _, BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__)) \
/***/
#endif
#endif //MAPNIK_UTIL_WINDOWS_C2995_HPP

2
include/mapnik/wkt/wkt_grammar_x3_def.hpp
View file

@ -25,7 +25,7 @@
#include <mapnik/wkt/wkt_grammar_x3.hpp>
#include <mapnik/geometry/fusion_adapted.hpp>
#include <mapnik/util/windows_c2995.hpp>
#ifdef __GNUC__
// instantiate `is_substitute` for reference T and reference Attribute
// fixes gcc6 compilation issue

2
src/image_options.cpp
View file

@ -21,7 +21,7 @@
*****************************************************************************/
#include <mapnik/image_options.hpp>
#include <mapnik/util/windows_c2995.hpp>
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp>

1
src/json/extract_bounding_boxes_x3.cpp
View file

@ -27,7 +27,6 @@
#include <mapnik/json/geojson_grammar_x3.hpp>
#include <mapnik/json/unicode_string_grammar_x3.hpp>
#include <mapnik/json/positions_grammar_x3.hpp>
#include <mapnik/util/windows_c2995.hpp>
namespace mapnik { namespace json {

3
src/svg/svg_parser.cpp
View file

@ -30,8 +30,7 @@
#include <mapnik/util/file_io.hpp>
#include <mapnik/util/utf_conv_win.hpp>
#include <mapnik/util/dasharray_parser.hpp>
#include <mapnik/json/json_grammar_config.hpp>
#include <mapnik/util/windows_c2995.hpp>
#pragma GCC diagnostic push
#include <mapnik/warning_ignore_agg.hpp>
#include "agg_ellipse.h"