artemp
2a2f0bf00a
Workaround for VC++ C2995 via redifining BOOST_SPIRIT_DEFINE macro ( #3573 )
2016-12-14 15:10:22 +01:00
artemp
9f91bb018a
update deps
2016-12-14 11:17:42 +01:00
artemp
e46785a063
wrap grammar into anonymous namespace - attempting to fix VC++ compilation issue ( #3573 )
2016-12-14 10:49:11 +01:00
Artem Pavlenko
9010cd9ac6
Merge pull request #3572 from mapnik/issue-3570
...
simplify mapnik::value conversion rules
2016-12-14 10:22:35 +01:00
Mickey Rose
7c14964de3
simplify mapnik::value conversion rules
...
- fixes #3570
- avoids recursive exception-specification on value constructor
by only constructing a temporary for arithmetic types (everything
else passes a reference to the base variant constructor)
- also removes `is_same<decay_t<T>, value>` SFINAE check -- because
we're only passing a reference down, explicitly forcing the compiler
to use the implicitly-defined copy/move instead is pointless
2016-12-14 02:37:27 +01:00
artemp
81fafe8198
update test to use std::unordered_map<mapnik::value, mapnik::value>
2016-12-13 17:03:09 +01:00
artemp
e3a1efabe9
use latest mapbox::variant
2016-12-13 16:39:16 +01:00
artemp
e40a1d9a15
expand std::hash<mapnik::value> and operator== test for all types in mapnik::value
2016-12-13 16:16:19 +01:00
artemp
c2a61161a6
remove hash_combine (unused)
2016-12-13 15:51:57 +01:00
artemp
0307499753
simplify hash calculation (we don't need combine with which(), using hash<T> is sufficient)
2016-12-13 15:50:00 +01:00
artemp
8e15353818
minor format tweak
2016-12-13 15:49:03 +01:00
artemp
b7a4cd99d7
update BOOST_MIN_VERSION to 1.61
2016-12-09 17:55:51 +01:00
artemp
2924d736a8
update version to 3.1.0
2016-12-09 17:07:23 +01:00
artemp
fc54faac54
make parse_map_sizes standalone method + upgrade parser to use boost::spirit::x3
2016-12-09 11:52:25 +01:00
artemp
c5174d2862
port parse_hex to use boost::spirit::x3
2016-12-09 11:49:53 +01:00
artemp
5eaf37404a
remove unused using directive
2016-12-09 11:49:08 +01:00
artemp
0d703ee552
cleanup include directives
2016-12-08 18:55:55 +01:00
artemp
1372ca48ef
SConstruct - require c++14
2016-12-08 10:43:25 +01:00
artemp
fe7e9a7dc5
use mapbox namespace to fix name resolution
2016-12-06 15:14:28 +01:00
artemp
87c65e888d
update variant dep
2016-12-06 14:56:52 +01:00
artemp
a07a8cd6fe
use <mapnik/util/variant_io.hpp> which has specialisation for boolean type
2016-12-06 14:56:04 +01:00
artemp
df10fab439
only add valid bounding boxes (make backward compatible)
2016-12-06 12:23:09 +01:00
talaj
218fba4479
Merge pull request #3529 from lightmare/group-pair-layout
...
fix #3526 GroupSymbolizer PairLayout with 3+ items
2016-12-05 21:35:11 +01:00
Mickey Rose
cb41fc5d48
fix #3526 GroupSymbolizer PairLayout with 3+ items
2016-12-05 16:26:03 +01:00
Jiri Drbalek
6364e07d71
duplicate code elimination
2016-12-05 11:25:33 +01:00
Jiri Drbalek
2174c10b2f
find max element instead of std::sort
2016-12-03 14:33:55 +00:00
Jiri Drbalek
4cdc3428bd
remove redundant code
2016-12-03 13:10:07 +00:00
Dane Springmeyer
ec5964d855
Merge pull request #3568 from mapnik/gcc-again
...
Travis: Add g++ testing, upgrade to clang++ 3.9, downgrade to libstdc++-4.9
2016-12-02 14:11:09 -08:00
Dane Springmeyer
05936826b3
allow visual test failures with g++ https://github.com/mapnik/mapnik/issues/3567
2016-12-02 14:05:16 -08:00
Dane Springmeyer
8262eb5206
avoid -Wshadow and 'unrecognized command line option' with gcc
2016-12-02 13:43:43 -08:00
Dane Springmeyer
9cc8af9173
try g++6 on precise
2016-12-02 13:43:42 -08:00
Dane Springmeyer
e57ac30690
use clang 3.9, g++-6
2016-12-02 13:43:42 -08:00
artemp
5ea5f18a7e
cleanups
2016-12-02 12:42:07 +01:00
artemp
6824f4c477
fix more gcc warnings
2016-12-02 11:42:57 +01:00
artemp
069de8e266
fix gcc6 compilation issue
2016-12-02 11:04:11 +01:00
Dane Springmeyer
8b6059eab6
mason packages are currently built with -D_GLIBCXX_USE_CXX11_ABI=0
2016-12-01 09:50:34 -08:00
artemp
2f8da6dfd5
reduce compiler warnings (gcc 6)
2016-12-01 17:17:56 +01:00
artemp
410a2ce7ca
from_geojson(json, geometry) - remove temp feature/ parse directly into geometry
2016-11-30 12:21:56 +01:00
artemp
56d5ffb473
remove unused headers
2016-11-30 12:21:38 +01:00
artemp
b01481ded7
refactor feature_grammar_x3 to have a cleaner separation between feature and geometry rules
2016-11-30 11:33:35 +01:00
artemp
2dc57effb8
allow null geometry
2016-11-29 16:26:58 +01:00
Artem Pavlenko
2f5c12f28a
Merge pull request #3560 from mapycz/minor-cleanup
...
remove methods that are not referenced anywhere
2016-11-29 16:02:58 +01:00
Jiri Drbalek
2b852ad1f9
remove methods that are not referenced anywhere
2016-11-29 14:55:06 +00:00
artemp
f7cf220688
fix Makefike - remove utils/mapnik-index/process_geojson_file.o
2016-11-29 15:28:32 +01:00
artemp
9887270b9e
Merge branch 'develop-master'
2016-11-29 11:18:31 +01:00
artemp
d88bf9e1ef
remove unused old headers
2016-11-29 10:48:48 +01:00
artemp
36eb7f61bd
implement from_geojson in terms of parse_(feature|geometry)
2016-11-29 10:48:06 +01:00
artemp
941a025682
remove spirit::qi usage from (Geo)JSON
2016-11-29 10:46:23 +01:00
artemp
0ec510025d
mapnik-index - remove -x3 option, use process_geojson_x3 always
2016-11-29 09:20:41 +01:00
artemp
2fcd608ab3
remove spirit spirit::qi usage
2016-11-28 18:42:29 +01:00
