Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at fix-function-merge 26 lines 897 B view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index e68d2e9..ddba150 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -48,7 +48,7 @@ find_package(LIBMEMCACHED) 6 find_package(LIBRADOS) 7 8 if(LIBMAPNIK_VERSION STRGREATER_EQUAL "4") 9- set(CMAKE_CXX_STANDARD 14) 10+ set(CMAKE_CXX_STANDARD 17) 11 endif() 12 13 # Programs 14diff --git a/src/parameterize_style.cpp b/src/parameterize_style.cpp 15index 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(); 20 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"); 24 25 if (table && table->find(",name") != std::string::npos) { 26 std::string str = *table;