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
Mickey Rose
239623f976
remove unused variable [skip ci]
2016-01-30 03:24:07 +01:00
lightmare
e75342ac09
Merge pull request #3275 from lightmare/cleanup-noexcept-and-defaulted
...
Cleanup defaulted constructors and assignment operators, noexcept specifiers
2016-01-30 03:22:47 +01:00
Mickey Rose
a8d8a0d74f
make clang happy - const default initialization
...
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#253
http://stackoverflow.com/questions/7411515/why-does-c-require-a-user-provided-default-constructor-to-default-construct-a
http://stackoverflow.com/questions/21900237/do-i-really-need-to-implement-user-provided-constructor-for-const-objects
2016-01-30 02:03:25 +01:00
Mickey Rose
be5d772d6c
attempt to fortify mapnik::value conversion construction
...
- including correct noexcept specifier
- adding conversion-assignment operator wasn't really necessary,
but it might be more efficient since it avoids constructing an
intermediate variant
2016-01-30 02:03:25 +01:00
Mickey Rose
400e05585f
refine noexcept specifiers on forwarding conversion constructors
2016-01-30 02:03:25 +01:00
Mickey Rose
b2c14972de
remove explicitly-defaulted constructors and assignment operators ...
...
... where they should be implicitly defined by the compiler
2016-01-30 02:03:25 +01:00
Dane Springmeyer
61ffe096fc
latest variant
2016-01-29 16:32:09 -08:00
Dane Springmeyer
24e4c67a34
Merge branch 'master' of github.com:mapnik/mapnik
2016-01-29 16:31:29 -08:00
Dane Springmeyer
a447c78d2e
ensure valid objects in shapeindex test
2016-01-29 16:30:03 -08:00
Dane Springmeyer
0b22bd87f7
shape_index_featureset: initialize members explicitly - remove debug print
2016-01-29 16:29:43 -08:00
Dane Springmeyer
32bbccb8fd
fix #3276
2016-01-29 16:29:12 -08:00
Dane Springmeyer
0291e851fe
disable g++4.9 build which gets killed / use clang 3.6 to prepare for c++14 support
2016-01-29 16:05:09 -08:00
Dane Springmeyer
bc89f7f877
upgrade to latest variant - refs mapbox/variant#73
2016-01-29 15:54:15 -08:00
Dane Springmeyer
b3170c397c
travis: linux: test gcc49 / osx: use xcode7 - closes #3240
2016-01-29 15:31:13 -08:00
artemp
64c2ad1e93
Just let the compiler generate move/copy for mapnik::value - via @lightmare ref https://github.com/mapnik/mapnik/issues/3274#issuecomment-176730124
2016-01-29 15:05:08 +01:00
artemp
a50036d421
value - make noexcept
conditional + add move assigment operator
2016-01-29 13:07:43 +01:00
artemp
4233fb4abb
update deps
2016-01-29 11:37:01 +01:00
artemp
3e866e63b2
Merge branch 'master' into spirit-x3
2016-01-29 11:15:19 +01:00
lightmare
0b2775a5e1
Merge pull request #3265 from lightmare/refactor-symbolizers
...
refactoring group, markers symbolizers to reduce compile time / memory usage
2016-01-29 02:23:12 +01:00
Mickey Rose
1eb298f48c
fix text_render_thunk construction
...
- this reverts render_thunk_extractor visitation by text/shield
symbolizer back to how it works in master, only amended to avoid
passing temporaries to text_symbolizer_helper
2016-01-29 00:12:18 +01:00
Mickey Rose
7bbc758fbc
cleanup extraneous includes
2016-01-29 00:12:18 +01:00
Mickey Rose
6d84094f77
move render_markers_symbolizer to separate .cpp
2016-01-29 00:12:18 +01:00
Mickey Rose
f99c0e5a6f
refactor render_markers_symbolizer
2016-01-29 00:10:19 +01:00