From 25a9ca397d9fe2c02afd2740cbbc82df747a2b8a Mon Sep 17 00:00:00 2001 From: rjanvier Date: Sun, 18 Jun 2023 23:29:36 +0200 Subject: [PATCH] Fixes for Linux compilation --- include/Graph.h | 2 +- src/TreeIso.cpp | 4 +--- src/qTreeIso.cpp | 4 +--- ui/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/Graph.h b/include/Graph.h index 52fff73..b326a78 100644 --- a/include/Graph.h +++ b/include/Graph.h @@ -75,7 +75,7 @@ namespace CP template using EdgeAttributeMap = boost::adj_list_edge_property_map< boost::directed_tag, EdgeAttribute, EdgeAttribute & - , unsigned __int64, CP::EdgeAttribute, boost::edge_bundle_t>; + , uint64_t, CP::EdgeAttribute, boost::edge_bundle_t>; template using VertexIndexMap = typename boost::property_map, boost::vertex_index_t>::type; template diff --git a/src/TreeIso.cpp b/src/TreeIso.cpp index 3065295..cd82e54 100644 --- a/src/TreeIso.cpp +++ b/src/TreeIso.cpp @@ -1,6 +1,4 @@ -#pragma once - -//####################################################################################### +//####################################################################################### //# # //# CLOUDCOMPARE PLUGIN: qTreeIso # //# # diff --git a/src/qTreeIso.cpp b/src/qTreeIso.cpp index e235b90..c421898 100644 --- a/src/qTreeIso.cpp +++ b/src/qTreeIso.cpp @@ -1,6 +1,4 @@ -#pragma once - -//####################################################################################### +//####################################################################################### //# # //# CLOUDCOMPARE PLUGIN: qTreeIso # //# # diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 99d9d03..87c04b1 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -1,5 +1,5 @@ target_sources( ${PROJECT_NAME} PRIVATE - ${CMAKE_CURRENT_LIST_DIR}/TreeISODlg.ui + ${CMAKE_CURRENT_LIST_DIR}/TreeIsoDlg.ui )