Mickey Rose
5764d619f3
expressions test: move expression strings into Catch calls, continue on failure
2016-02-05 17:22:01 +01:00
Mickey Rose
53bb55eade
rename expresssions_test.cpp, didn't pass spell check
2016-02-05 17:22:01 +01:00
artemp
cb708d7f5a
transform_grammar: correct and simplify rules per bcc7495a87 (commitcomment-15915607)
...
image_filter: relax `agg-stack-blur` rule to allow `agg-stack-blur,agg-stack-blur(),agg-stack-blur(1),agg-stack-blur(1,1)` syntax + add image filter parsing tests
2016-02-05 16:50:49 +01:00
artemp
3af34690c0
transform_grammar: correct and simplify rules per bcc7495a87 (commitcomment-15915607)
...
image_filter: relax `agg-stack-blur` rule to allow `agg-stack-blur,agg-stack-blur(),agg-stack-blur(1),agg-stack-blur(1,1)` syntax + add image filter parsing tests
2016-02-05 16:34:22 +01:00
artemp
bcc7495a87
transform grammar - fix optional seprator logic
2016-02-05 13:08:17 +01:00
artemp
59f818fe2d
transform grammar - fix optional separator logic
2016-02-05 13:05:15 +01:00
artemp
fc037cb62b
agg_stack_blur - add ctors
2016-02-05 13:04:36 +01:00
artemp
ee2277a610
Merge branch 'master' into spirit-x3
2016-02-05 13:04:06 +01:00
bergwerkgis
eeb1507c6d
AppVeyor: new try, nr.2
2016-02-05 11:13:09 +00:00
bergwerkgis
9d359ff3df
AppVeyor: new try, nr.1
2016-02-05 11:05:12 +00:00
Mickey Rose
7594301d98
test/shapeindex: include loop variables in failure message
...
[skip ci]
2016-02-04 18:54:21 +01:00
artemp
48127c3754
use clang-3.6 for spirit-x3 branch (c++14 support)
2016-02-04 16:49:10 +01:00
artemp
a25993fc9b
try JOBS=8/HEAVY_JOBS=4
2016-02-04 16:36:33 +01:00
artemp
8c1f71c39e
try 8 JOBS
2016-02-04 12:51:20 +01:00
artemp
c4ff46b243
Merge branch 'master' into spirit-x3
2016-02-04 11:38:24 +01:00
bergwerkgis
9282c60c91
AppVeyor: try again mapnik::value_null - correct <=, >= return values
2016-02-04 10:21:41 +00:00
artemp
7ab93a30f2
mapnik::value_null - correct <=, >= return values ref #3285
2016-02-04 10:06:11 +01:00
artemp
835e60d900
mapnik::value_null - correct <=, >= return values ref #3285
2016-02-04 10:04:27 +01:00
Dane Springmeyer
7ad4bf379d
stick with clang-3.5 for now
...
- I have early evidence that mapnik compiled with 3.6 and mapnik-vt compiled with 3.5 == crashes
- Also the mason deps are still compiled with 3.5
- TODO: upgrade mapnik, mapnik-vt, and all mason deps to 3.6 all at once.
2016-02-03 11:18:00 -08:00
Dane Springmeyer
52cabfd107
expat is no longer a must have cairo dep since cairo can be built without fontconfig [skip ci]
2016-02-03 10:57:09 -08:00
artemp
d416f9fb7b
Merge branch 'master' into spirit-x3
2016-02-03 17:24:11 +01:00
artemp
35ab8cccdc
follow up on previous commit - convert to common_type prior applying / (MSCV C4804)
2016-02-03 12:45:29 +01:00
artemp
376ffba7fe
convert value_bool to value_integer before operator / (fixes unsafe use of bool - MSVC C4804)
2016-02-03 12:35:09 +01:00
artemp
c0724a6d95
value comparison - deduct return type automatically (fixes MSVC C4800)
2016-02-03 12:33:15 +01:00
artemp
09163f969d
deps - update variant
2016-02-03 11:06:00 +01:00
Dane Springmeyer
1600bfe981
remove dead code in enumeration.hpp
2016-02-02 12:35:19 -08:00
Dane Springmeyer
09f137796d
use std namespace for clib functions and fix spelling in comments
2016-02-02 12:35:19 -08:00
Dane Springmeyer
bc08617eb8
Merge pull request #3281 from mapnik/no-miniz
...
remove miniz support
2016-02-02 12:33:12 -08:00
Dane Springmeyer
834028db7a
remove miniz support - library is unused in mapnik and unmaintained since 2013 ( https://code.google.com/archive/p/miniz/ )
2016-02-02 11:37:26 -08:00
artemp
76fe23d3af
Merge branch 'master' into spirit-x3
2016-02-02 12:45:14 +01:00
artemp
b427139951
update variant
2016-02-02 12:41:22 +01:00
artemp
13af423046
unit test - use 'parse_image_filters' and avoid instantiating expensive redundant grammar
2016-02-02 11:30:00 +01:00
artemp
39a97865fc
image_filter_grammar - move 'BOOST_FUSION_ADAPT_STRUCT` into *_impl.hpp
2016-02-02 11:30:00 +01:00
artemp
b16af14611
update deps
2016-02-02 11:27:16 +01:00
artemp
cd2b13eb57
unit test - use 'parse_image_filters' and avoid instantiating expensive redundant grammar
2016-02-02 11:25:32 +01:00
artemp
4122826031
image_filter_grammar - move 'BOOST_FUSION_ADAPT_STRUCT` into *_impl.hpp
2016-02-02 11:23:08 +01:00
artemp
e48aaf5c13
Merge branch 'master' into spirit-x3
2016-02-02 10:28:42 +01:00
Dane Springmeyer
e76a1d9a81
[csv] use faster version of csv_utils::parse_line in more places + fix error output
2016-02-01 12:23:26 -08:00
Dane Springmeyer
b93d3e5d7e
remove grammars from pre-compile since these are under flux /cc @artemp
2016-02-01 12:01:03 -08:00
Dane Springmeyer
d59460861e
update to latest variant
2016-02-01 11:51:23 -08:00
artemp
093009137e
css_color - re-factor grammar into *_x3.hpp, *_x3_def.hpp, *_x3.cpp. Make css_color_grammar_type available via css_color_grammar::css_color_grammar_type color_grammar();
2016-02-01 15:34:18 +01:00
artemp
4b5a73e21b
Merge branch 'master' into spirit-x3
2016-02-01 10:04:07 +01:00
artemp
33be145be9
variant - update to the latest upstream
2016-02-01 09:22:14 +01:00
Mickey Rose
958fcbf165
travis: try fewer jobs on osx
2016-01-31 15:44:25 +01:00
Mickey Rose
f9248914af
travis: add SCons timings, fix comment in Makefile
2016-01-31 15:36:00 +01:00
Mickey Rose
4ef8efd554
remove struct member designators from initialization - fixes #3277
...
- it's C99 syntax, illegal in C++11 braced-init-list
- interestingly it's accepted in C++ by GCC and Clang,
rejected by MSVC
2016-01-30 20:44:40 +01:00
Dane Springmeyer
57027eeee3
trim back what we build on OS X to try to save time
2016-01-29 20:04:42 -08:00
Dane Springmeyer
971c37691b
travis/osx - parellelize the heavy compile jobs
...
- We can probably get away with this since OS X
does not have an OOM killer
- Will watch to see if it actually helps overall build times...
2016-01-29 19:00:04 -08:00
Dane Springmeyer
7ddb3cc4a2
try more JOBS=10 on osx
2016-01-29 18:32:14 -08:00
Dane Springmeyer
09ce7a0ea2
use xcode7.2 rather than 7.0.1
2016-01-29 18:31:35 -08:00
