Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
LidarView
LidarView-Superbuild
Commits
f2dade89
Commit
f2dade89
authored
Jul 15, 2016
by
Bastien Jacquet
Browse files
Patch liblas uint64_t ambiguous usage from boost and stdint
parent
77d2f306
Changes
2
Hide whitespace changes
Inline
Side-by-side
Projects/liblas.cmake
View file @
f2dade89
add_external_project
(
liblas
DEPENDS boost
PATCH_COMMAND
git apply --whitespace=fix
${
SuperBuild_PROJECTS_DIR
}
/patches/liblas.uint64.boost.patch
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
)
Projects/patches/liblas.uint64.boost.patch
0 → 100644
View file @
f2dade89
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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment