From bae7d572b9591c665a8b51829b6168fb233b3d08 Mon Sep 17 00:00:00 2001 From: Lars Ivar Hatledal Date: Sun, 27 Oct 2024 13:36:15 +0100 Subject: [PATCH] update --- include/fmi4cpp/fmi2/fmi2_library.hpp | 2 +- src/fmi4cpp/fmi2/fmi2_library.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/fmi4cpp/fmi2/fmi2_library.hpp b/include/fmi4cpp/fmi2/fmi2_library.hpp index 961d379..bf00502 100644 --- a/include/fmi4cpp/fmi2/fmi2_library.hpp +++ b/include/fmi4cpp/fmi2/fmi2_library.hpp @@ -55,10 +55,10 @@ class fmi2_library fmi2FreeInstanceTYPE* fmi2FreeInstance_; -private: #ifdef _WIN32 DLL_DIRECTORY_COOKIE dllDirectoryCookie_ = nullptr; #endif + protected: fmi2Status lastStatus_; DLL_HANDLE handle_ = nullptr; diff --git a/src/fmi4cpp/fmi2/fmi2_library.cpp b/src/fmi4cpp/fmi2/fmi2_library.cpp index 06f7f87..2b97404 100644 --- a/src/fmi4cpp/fmi2/fmi2_library.cpp +++ b/src/fmi4cpp/fmi2/fmi2_library.cpp @@ -33,7 +33,7 @@ std::string to_string(fmi2Status status) } } -void logger(void* fmi2ComponentEnvironment, fmi2String instance_name, fmi2Status status, fmi2String category, +void logger(void* /*fmi2ComponentEnvironment*/, fmi2String instance_name, fmi2Status status, fmi2String category, fmi2String message, ...) { char msg[1000]; @@ -62,7 +62,7 @@ fmi2_library::fmi2_library(const std::string& modelIdentifier, const std::shared #ifdef _WIN32 std::string dllDirectory; - fmi4cpp::fs::path path(libName); + std::filesystem::path path(libName); if (path.has_parent_path()) { dllDirectory = path.parent_path().string();