Commit f2dade89 authored by Bastien Jacquet's avatar Bastien Jacquet
Browse files

Patch liblas uint64_t ambiguous usage from boost and stdint

parent 77d2f306
add_external_project(liblas add_external_project(liblas
DEPENDS boost DEPENDS boost
PATCH_COMMAND
git apply --whitespace=fix ${SuperBuild_PROJECTS_DIR}/patches/liblas.uint64.boost.patch
CMAKE_ARGS CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON
) )
diff --git a/src/classification.cpp b/src/classification.cpp
index e492382..090eb63 100644
--- a/src/classification.cpp
+++ b/src/classification.cpp
@@ -106,7 +106,7 @@ uint8_t Classification::GetClass() const
{
bitset_type bits(m_flags);
- bitset_type const mask(static_cast<uint64_t>(class_table_size) - 1);
+ bitset_type const mask(static_cast<boost::uint64_t>(class_table_size) - 1);
bits &= mask;
uint32_t const index = static_cast<uint32_t>(bits.to_ulong());
@@ -120,7 +120,7 @@ void Classification::SetClass(uint32_t index)
{
check_class_index(index);
- bitset_type binval(static_cast<uint64_t>(index));
+ bitset_type binval(static_cast<boost::uint64_t>(index));
binval <<= 0;
// Store value in bits 0,1,2,3,4
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment