Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build skadi with -Werror #3935

Merged
merged 1 commit into from
Jan 26, 2023
Merged

Build skadi with -Werror #3935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* ADDED: log matrix algorithm which was used [#3916](https://github.com/valhalla/valhalla/pull/3916)
* UPDATED: docker base image to Ubuntu 22.04 [#3912](https://github.com/valhalla/valhalla/pull/3912)
* CHANGED: Unify handling of single-file -Werror in all modules [#3910](https://github.com/valhalla/valhalla/pull/3910)
* CHANGED: Build skadi with -Werror [#3935](https://github.com/valhalla/valhalla/pull/3935)

## Release Date: 2023-01-03 Valhalla 3.3.0
* **Removed**
Expand Down
4 changes: 2 additions & 2 deletions src/skadi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
file(GLOB headers ${VALHALLA_SOURCE_DIR}/valhalla/skadi/*.h)

valhalla_module(NAME skadi
SOURCES_WITH_WARNINGS
SOURCES
sample.cc
util.cc
${VALHALLA_SOURCE_DIR}/third_party/lz4/lib/lz4.c
Expand All @@ -20,4 +20,4 @@ valhalla_module(NAME skadi
DEPENDS
valhalla::baldr
Boost::boost
ZLIB::ZLIB)
ZLIB::ZLIB)
6 changes: 3 additions & 3 deletions src/skadi/sample.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class tile_data {
bool reusable;

public:
tile_data() : c(nullptr), index(TILE_COUNT), reusable(false), data(nullptr) {
tile_data() : c(nullptr), data(nullptr), index(TILE_COUNT), reusable(false) {
}

tile_data(const tile_data& other) : c(nullptr) {
Expand Down Expand Up @@ -308,12 +308,12 @@ struct cache_t {
return cache.size();
}

bool insert(int pos, const std::string& path, format_t format);
bool insert(size_t pos, const std::string& path, format_t format);

tile_data source(uint16_t index);
};

bool cache_t::insert(int pos, const std::string& path, format_t format) {
bool cache_t::insert(size_t pos, const std::string& path, format_t format) {
if (pos >= cache.size())
return false;

Expand Down