moving things around, stoi-> stoull

Hugoberry · Mar 29, 2024 · 92c0ae4 · 92c0ae4
1 parent c20b24c
commit 92c0ae4
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,12 +13,9 @@ find_package(tinyxml2 REQUIRED)
 find_package(unofficial-sqlite3 REQUIRED)
 find_package(Crc32c REQUIRED)
 # find_package(kaitai-struct-cpp-stl-runtime REQUIRED)
-if(NOT Crc32c_FOUND)
-    message(FATAL_ERROR "Crc32c not found")
-endif()
 
-find_package(Threads REQUIRED)
 
+find_package(Threads REQUIRED)
 
 
 set(EXTENSION_NAME ${TARGET_NAME}_extension)

diff --git a/Makefile b/Makefile
@@ -7,7 +7,8 @@ EXT_CONFIG=${PROJ_DIR}extension_config.cmake
 
 # Setting CMAKE_PREFIX_PATH environment variable
 # export CMAKE_PREFIX_PATH := vcpkg_installed/x64-linux:${CMAKE_PREFIX_PATH}
-# export CMAKE_PREFIX_PATH := vcpkg_installed/x64-linux/share/unofficial-sqlite3:${CMAKE_PREFIX_PATH}
+# export CMAKE_PREFIX_PATH := vcpkg_installed/x64-linux/share/kaitai-struct-cpp-stl-runtime:${CMAKE_PREFIX_PATH}
+# export kaitai-struct-cpp-stl-runtime_DIR := /workspaces/duckdb-pbix-extension/build/release/vcpkg_installed/x64-linux/share/kaitai-struct-cpp-stl-runtime
 
 VCPKG_TOOLCHAIN_FILE=/workspaces/duckdb-pbix-extension/vcpkg/scripts/buildsystems/vcpkg.cmake
 

diff --git a/src/abf/BackupFile.cpp b/src/abf/BackupFile.cpp
@@ -16,7 +16,7 @@ BackupFile BackupFile::from_value(tinyxml2::XMLElement& element, const std::stri
     }
     XMLElement* offsetHeaderElement = element.FirstChildElement("m_cbOffsetHeader");
     if (offsetHeaderElement && offsetHeaderElement->GetText()) {
-        file.m_cbOffsetHeader = std::stoi(offsetHeaderElement->GetText());
+        file.m_cbOffsetHeader = std::stoull(offsetHeaderElement->GetText());
     }
     XMLElement* deleteElement = element.FirstChildElement("Delete");
     if (deleteElement && deleteElement->GetText()) {

diff --git a/src/abf/BackupFile.h b/src/abf/BackupFile.h
@@ -11,7 +11,7 @@ class BackupFile {
 public:
     std::optional<std::string> Path;
     int Size;
-    int m_cbOffsetHeader;
+    uint64_t m_cbOffsetHeader;
     bool Delete;
     int64_t CreatedTimestamp;
     int64_t Access;

diff --git a/src/kaitai/column_data_dictionary.cpp → src/ksy/column_data_dictionary.cpp b/src/kaitai/column_data_dictionary.cpp → src/ksy/column_data_dictionary.cpp
diff --git a/src/kaitai/column_data_dictionary.h → src/ksy/column_data_dictionary.h b/src/kaitai/column_data_dictionary.h → src/ksy/column_data_dictionary.h
diff --git a/src/kaitai/column_data_hidx.cpp → src/ksy/column_data_hidx.cpp b/src/kaitai/column_data_hidx.cpp → src/ksy/column_data_hidx.cpp
diff --git a/src/kaitai/column_data_hidx.h → src/ksy/column_data_hidx.h b/src/kaitai/column_data_hidx.h → src/ksy/column_data_hidx.h
diff --git a/src/kaitai/column_data_idf.cpp → src/ksy/column_data_idf.cpp b/src/kaitai/column_data_idf.cpp → src/ksy/column_data_idf.cpp
diff --git a/src/kaitai/column_data_idf.h → src/ksy/column_data_idf.h b/src/kaitai/column_data_idf.h → src/ksy/column_data_idf.h
diff --git a/src/kaitai/idfmeta_parser.cpp → src/ksy/idfmeta_parser.cpp b/src/kaitai/idfmeta_parser.cpp → src/ksy/idfmeta_parser.cpp
diff --git a/src/kaitai/idfmeta_parser.h → src/ksy/idfmeta_parser.h b/src/kaitai/idfmeta_parser.h → src/ksy/idfmeta_parser.h