Skip to content

Commit bc33cf9

Browse files
authored
Minor fixes (openstreetmap#442)
* `.github/actions/coverage/action.yml` * Ignore `unused` errors when excluding coverage directories * `docs/build/building_on_ubuntu.md` * Fix typo * `src/parameterize_style.cpp` * Use `auto` rather than `std::optional<std::string>`/`boost::optional<std::string>`
1 parent 1f81434 commit bc33cf9

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

.github/actions/coverage/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ runs:
2424
--output-file coverage.info \
2525
--rc geninfo_unexecuted_blocks=1
2626
lcov ${{ inputs.lcov-extra-options }} \
27+
--ignore-errors unused \
2728
--output-file coverage.info \
2829
--remove coverage.info \
2930
"${GITHUB_WORKSPACE}/includes/*" \

docs/build/building_on_ubuntu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Please see our [Continuous Integration script](/.github/workflows/build-and-test
66

77
A Docker-based building & testing setup pipeline is also available [here](/docker) for your convenience.
88

9-
# Ubuntu 20.04/22.04.24.04
9+
# Ubuntu 20.04/22.04/24.04
1010

1111
```shell
1212
#!/usr/bin/env bash

src/parameterize_style.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,7 @@ static void parameterize_map_language(mapnik::Map &m, char *parameter)
6868
mapnik::parameters params = l.datasource()->params();
6969

7070
if (params.find("table") != params.end()) {
71-
#if MAPNIK_MAJOR_VERSION >= 4
72-
std::optional<std::string> table = params.get<std::string>("table");
73-
#else
74-
boost::optional<std::string> table = params.get<std::string>("table");
75-
#endif
71+
auto table = params.get<std::string>("table");
7672

7773
if (table && table->find(",name") != std::string::npos) {
7874
std::string str = *table;

0 commit comments

Comments
 (0)