Merge pull request #330634 from r-ryantm/auto-update/circumflex
[NixPkgs.git] / pkgs / servers / http / apache-modules / mod_tile / mod_tile-std_optional.patch
blob1f63ce0bc1f1d913ca99d7005d7e038e97f3fb9e
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index e68d2e9..ddba150 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -48,7 +48,7 @@ find_package(LIBMEMCACHED)
6 find_package(LIBRADOS)
8 if(LIBMAPNIK_VERSION STRGREATER_EQUAL "4")
9 - set(CMAKE_CXX_STANDARD 14)
10 + set(CMAKE_CXX_STANDARD 17)
11 endif()
13 # Programs
14 diff --git a/src/parameterize_style.cpp b/src/parameterize_style.cpp
15 index 8db7122..7100735 100644
16 --- a/src/parameterize_style.cpp
17 +++ b/src/parameterize_style.cpp
18 @@ -72,7 +74,7 @@ static void parameterize_map_language(mapnik::Map &m, char * parameter)
19 mapnik::parameters params = l.datasource()->params();
21 if (params.find("table") != params.end()) {
22 - boost::optional<std::string> table = params.get<std::string>("table");
23 + auto table = params.get<std::string>("table");
25 if (table && table->find(",name") != std::string::npos) {
26 std::string str = *table;