Merge pull request #1768 from roystgnr/warning_fixes_cherrypicked

Warning fixes
This commit is contained in:
Paul Romano 2021-02-23 10:04:02 -06:00 committed by GitHub
commit 242107fb63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -212,7 +212,7 @@ read_attribute(hid_t obj_id, const char* name, std::vector<std::string>& vec)
// Read char data in attribute
read_attr_string(obj_id, name, n, buffer);
for (int i = 0; i < m; ++i) {
for (decltype(m) i = 0; i < m; ++i) {
// Determine proper length of string -- strlen doesn't work because
// buffer[i] might not have any null characters
std::size_t k = 0;
@ -478,7 +478,7 @@ write_dataset(hid_t obj_id, const char* name,
// Copy data into contiguous buffer
char* temp = new char[n*m];
std::fill(temp, temp + n*m, '\0');
for (int i = 0; i < n; ++i) {
for (decltype(n) i = 0; i < n; ++i) {
std::copy(buffer[i].begin(), buffer[i].end(), temp + i*m);
}

View file

@ -137,7 +137,7 @@ public:
virtual void to_hdf5(hid_t group_id) const = 0;
//! Get the BoundingBox for this surface.
virtual BoundingBox bounding_box(bool pos_side) const { return {}; }
virtual BoundingBox bounding_box(bool /*pos_side*/) const { return {}; }
};
class CSGSurface : public Surface