From cfb08567c0c59716031a34270b39571c7581eec6 Mon Sep 17 00:00:00 2001 From: Gordon McCann Date: Tue, 28 Jun 2022 06:02:57 -0400 Subject: [PATCH] Fix bugs related to case sensitivity on Apple for dictionary generation. Fix some bugs based on type mismatch in function declaration/definition --- src/evb/CompassRun.h | 2 +- src/evb/EVBApp.cpp | 4 ++-- src/evbdict/CMakeLists.txt | 4 ++-- src/guidict/CMakeLists.txt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/evb/CompassRun.h b/src/evb/CompassRun.h index 07d86cc..a679365 100644 --- a/src/evb/CompassRun.h +++ b/src/evb/CompassRun.h @@ -23,7 +23,7 @@ namespace EventBuilder { { public: CompassRun(); - CompassRun(const std::string& dir, uint64_t bsize); + CompassRun(const std::string& dir, size_t bsize); ~CompassRun(); inline void SetDirectory(const std::string& dir) { directory = dir; } inline void SetScalerInput(const std::string& filename) { m_scalerinput = filename; } diff --git a/src/evb/EVBApp.cpp b/src/evb/EVBApp.cpp index 1925863..2a8188b 100644 --- a/src/evb/EVBApp.cpp +++ b/src/evb/EVBApp.cpp @@ -27,7 +27,7 @@ namespace EventBuilder { { } - void EVBApp::DefaultProgressCallback(long curVal, long totalVal) + void EVBApp::DefaultProgressCallback(int64_t curVal, int64_t totalVal) { double fraction = ((double)curVal)/totalVal; EVB_INFO("Percent of run built: {0}", fraction*100); @@ -212,4 +212,4 @@ namespace EventBuilder { void EVBApp::SetScalerFile(const std::string& fullpath) { EVB_TRACE("Scaler file set to {0}", fullpath); m_scalerfile = fullpath; } void EVBApp::SetBufferSize(uint64_t bufsize) { EVB_TRACE("Buffer size set to {0} hits", bufsize); m_buffersize = bufsize; } -} \ No newline at end of file +} diff --git a/src/evbdict/CMakeLists.txt b/src/evbdict/CMakeLists.txt index b7fac64..c95b366 100644 --- a/src/evbdict/CMakeLists.txt +++ b/src/evbdict/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(EVBDict SHARED) target_include_directories(EVBDict SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -ROOT_GENERATE_DICTIONARY(evbdict DataStructs.h LINKDEF LinkDef_evb.h MODULE EVBDict) +ROOT_GENERATE_DICTIONARY(evb_dict DataStructs.h LINKDEF LinkDef_evb.h MODULE EVBDict) target_sources(EVBDict PRIVATE DataStructs.h @@ -14,4 +14,4 @@ add_custom_command(TARGET EVBDict POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libEVBDict_rdict.pcm ${EVB_LIBRARY_DIR}/libEVBDict_rdict.pcm -) \ No newline at end of file +) diff --git a/src/guidict/CMakeLists.txt b/src/guidict/CMakeLists.txt index f434e36..ad7ea1f 100644 --- a/src/guidict/CMakeLists.txt +++ b/src/guidict/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(GuiDict SHARED) target_include_directories(GuiDict SYSTEM PUBLIC ../../vendor/spdlog/include/ ${ROOT_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -ROOT_GENERATE_DICTIONARY(guidict EVBMainFrame.h FileViewFrame.h LINKDEF LinkDef_Gui.h MODULE GuiDict) +ROOT_GENERATE_DICTIONARY(gui_dict EVBMainFrame.h FileViewFrame.h LINKDEF LinkDef_Gui.h MODULE GuiDict) target_sources(GuiDict PRIVATE FileViewFrame.h @@ -20,4 +20,4 @@ add_custom_command(TARGET GuiDict POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libGuiDict_rdict.pcm ${EVB_LIBRARY_DIR}/libGuiDict_rdict.pcm -) \ No newline at end of file +)