Skip to content

Commit

Permalink
Fixes for GCC 11
Browse files Browse the repository at this point in the history
  • Loading branch information
abellgithub committed May 24, 2021
1 parent a6c986f commit edfffca
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pdal/PointLayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ void PointLayout::setAllowedDims(StringList dimNames)

for (std::string& s : dimNames)
s = Utils::toupper(s);
for (const std::string& xyz : { "X", "Y", "Z" })
for (const std::string& xyz : StringList { "X", "Y", "Z" })
if (!Utils::contains(dimNames, xyz))
dimNames.push_back(xyz);
m_allowedDimNames = dimNames;
Expand Down
2 changes: 1 addition & 1 deletion pdal/SrsBounds.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ namespace Utils
}
}

PDAL_DLL std::ostream& operator << (std::ostream& out, const Bounds& bounds);
PDAL_DLL std::ostream& operator << (std::ostream& out, const SrsBounds& bounds);

} // namespace pdal

2 changes: 1 addition & 1 deletion pdal/compression/LazPerfVlrCompression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <lazperf/filestream.hpp>
#include <lazperf/vlr.hpp>
#ifndef LAZPERF_VERSION
#error "LAZperf version 2+ (supporting LAS version 1.4) not found
#error "LAZperf version 2+ (supporting LAS version 1.4) not found"
#endif

#include <pdal/util/IStream.hpp>
Expand Down
4 changes: 2 additions & 2 deletions vendor/gtest/src/gtest-death-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1288,15 +1288,15 @@ static void StackLowerThanAddress(const void* ptr,
// making comparison result unpredictable.
GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
static void StackLowerThanAddress(const void* ptr, bool* result) {
int dummy;
int dummy = 0;
*result = (&dummy < ptr);
}

// Make sure AddressSanitizer does not tamper with the stack here.
GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
static bool StackGrowsDown() {
int dummy;
int dummy = 0;
bool result;
StackLowerThanAddress(&dummy, &result);
return result;
Expand Down

0 comments on commit edfffca

Please sign in to comment.