From 399e96e581947010bce64d66c4d7ceeb3e4a2e70 Mon Sep 17 00:00:00 2001
From: Lars Ivar Hatledal <larsivarhatledal@gmail.com>
Date: Thu, 3 Oct 2024 09:37:10 +0200
Subject: [PATCH 1/3] fix typo [skip ci]

---
 vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vcpkg.json b/vcpkg.json
index 2a8680f..28143a0 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
-  "name": "threepp",
+  "name": "fmi4cpp",
   "dependencies": [
     "pugixml",
     "libzip"

From fbbd1ad841dd11f6743ad4c9fc1e95340ce3882c Mon Sep 17 00:00:00 2001
From: Lars Ivar Hatledal <laht@ntnu.no>
Date: Thu, 3 Oct 2024 09:53:53 +0200
Subject: [PATCH 2/3] remove fs_portability (#149)

---
 include/fmi4cpp/fmi2/fmu.hpp       |  5 ++---
 include/fmi4cpp/fmu_resource.hpp   |  7 +++----
 include/fmi4cpp/fs_portability.hpp | 19 -------------------
 src/CMakeLists.txt                 |  3 +--
 src/fmi4cpp/fmi2/fmi2_library.cpp  |  3 +--
 src/fmi4cpp/fmi2/fmu.cpp           |  4 ++--
 src/fmi4cpp/fmu_resource.cpp       |  4 ++--
 src/fmi4cpp/library_helper.hpp     | 13 +++++++------
 src/fmi4cpp/tools/unzipper.hpp     | 17 +++++++----------
 9 files changed, 25 insertions(+), 50 deletions(-)
 delete mode 100644 include/fmi4cpp/fs_portability.hpp

diff --git a/include/fmi4cpp/fmi2/fmu.hpp b/include/fmi4cpp/fmi2/fmu.hpp
index 7526486..128f488 100644
--- a/include/fmi4cpp/fmi2/fmu.hpp
+++ b/include/fmi4cpp/fmi2/fmu.hpp
@@ -4,11 +4,10 @@
 
 #include <fmi4cpp/fmi2/cs_fmu.hpp>
 #include <fmi4cpp/fmi2/me_fmu.hpp>
-#include <fmi4cpp/fmi2/xml/cs_model_description.hpp>
 #include <fmi4cpp/fmi2/xml/me_model_description.hpp>
 #include <fmi4cpp/fmu_base.hpp>
-#include <fmi4cpp/fs_portability.hpp>
 
+#include <filesystem>
 #include <memory>
 #include <string>
 
@@ -26,7 +25,7 @@ class fmu : public virtual fmu_provider<model_description, cs_fmu, me_fmu>
     std::shared_ptr<const fmi4cpp::fmi2::model_description> modelDescription_;
 
 public:
-    explicit fmu(const fs::path& fmuPath);
+    explicit fmu(const std::filesystem::path& fmuPath);
 
     [[nodiscard]] std::string get_model_description_xml() const;
     [[nodiscard]] std::shared_ptr<const fmi4cpp::fmi2::model_description> get_model_description() const override;
diff --git a/include/fmi4cpp/fmu_resource.hpp b/include/fmi4cpp/fmu_resource.hpp
index b96a184..9351d4e 100644
--- a/include/fmi4cpp/fmu_resource.hpp
+++ b/include/fmi4cpp/fmu_resource.hpp
@@ -2,8 +2,7 @@
 #ifndef FMI4CPP_FMURESOURCE_HPP
 #define FMI4CPP_FMURESOURCE_HPP
 
-#include <fmi4cpp/fs_portability.hpp>
-
+#include <filesystem>
 #include <string>
 
 namespace fmi4cpp
@@ -13,10 +12,10 @@ class fmu_resource
 {
 
 private:
-    const fs::path path_;
+    std::filesystem::path path_;
 
 public:
-    explicit fmu_resource(fs::path path);
+    explicit fmu_resource(std::filesystem::path path);
 
     [[nodiscard]] std::string resource_path() const;
 
diff --git a/include/fmi4cpp/fs_portability.hpp b/include/fmi4cpp/fs_portability.hpp
deleted file mode 100644
index da152f6..0000000
--- a/include/fmi4cpp/fs_portability.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ifndef FMI4CPP_FS_PORTABILITY_HPP
-#define FMI4CPP_FS_PORTABILITY_HPP
-
-#if __has_include(<filesystem>)
-#    include <filesystem>
-namespace fmi4cpp
-{
-namespace fs = std::filesystem;
-}
-#else
-#    include <experimental/filesystem>
-namespace fmi4cpp
-{
-namespace fs = std::experimental::filesystem;
-}
-#endif
-
-#endif //FMI4CPP_FS_PORTABILITY_HPP
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cbe2918..86e74a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,6 @@ set(publicHeaders
     "fmi4cpp/fmu_variable_accessor.hpp"
 
     "fmi4cpp/dll_handle.hpp"
-    "fmi4cpp/fs_portability.hpp"
 
     "fmi4cpp/fmi2/fmi2.hpp"
     "fmi4cpp/fmi2/fmu.hpp"
@@ -111,7 +110,7 @@ target_link_libraries(fmi4cpp
 if(WIN32)
     target_link_libraries(fmi4cpp PRIVATE "Bcrypt")
 elseif(UNIX)
-    target_link_libraries(fmi4cpp PRIVATE stdc++fs dl)
+    target_link_libraries(fmi4cpp PRIVATE dl)
 endif()
 
 
diff --git a/src/fmi4cpp/fmi2/fmi2_library.cpp b/src/fmi4cpp/fmi2/fmi2_library.cpp
index eadd59b..62dc382 100644
--- a/src/fmi4cpp/fmi2/fmi2_library.cpp
+++ b/src/fmi4cpp/fmi2/fmi2_library.cpp
@@ -1,6 +1,5 @@
 
 #include <fmi4cpp/fmi2/fmi2_library.hpp>
-#include <fmi4cpp/fs_portability.hpp>
 #include <fmi4cpp/library_helper.hpp>
 #include <fmi4cpp/mlog.hpp>
 #include <fmi4cpp/tools/os_util.hpp>
@@ -59,7 +58,7 @@ fmi2_library::fmi2_library(const std::string& modelIdentifier, const std::shared
 {
     const std::string libName = resource->absolute_library_path(modelIdentifier);
 
-    MLOG_DEBUG("Loading shared library '" + fs::path(libName).stem().string() + get_shared_library_extension() + "'");
+    MLOG_DEBUG("Loading shared library '" + std::filesystem::path(libName).stem().string() + get_shared_library_extension() + "'");
 
     handle_ = load_library(libName);
 
diff --git a/src/fmi4cpp/fmi2/fmu.cpp b/src/fmi4cpp/fmi2/fmu.cpp
index ae4ed46..e95d9b1 100644
--- a/src/fmi4cpp/fmi2/fmu.cpp
+++ b/src/fmi4cpp/fmi2/fmu.cpp
@@ -11,7 +11,7 @@
 using namespace fmi4cpp;
 using namespace fmi4cpp::fmi2;
 
-fmu::fmu(const fs::path& fmuPath)
+fmu::fmu(const std::filesystem::path& fmuPath)
 {
 
     if (!exists(fmuPath)) {
@@ -21,7 +21,7 @@ fmu::fmu(const fs::path& fmuPath)
     }
 
     const std::string fmuName = fmuPath.stem().string();
-    fs::path tmpPath(fs::temp_directory_path() /= fs::path("fmi4cpp_" + fmuName + "_" + generate_simple_id(8)));
+    std::filesystem::path tmpPath(std::filesystem::temp_directory_path() /= std::filesystem::path("fmi4cpp_" + fmuName + "_" + generate_simple_id(8)));
 
     if (!create_directories(tmpPath)) {
         const auto err = "Failed to create temporary directory '" + tmpPath.string() + "' !";
diff --git a/src/fmi4cpp/fmu_resource.cpp b/src/fmi4cpp/fmu_resource.cpp
index d6b23ea..42654a2 100644
--- a/src/fmi4cpp/fmu_resource.cpp
+++ b/src/fmi4cpp/fmu_resource.cpp
@@ -9,7 +9,7 @@
 
 using namespace fmi4cpp;
 
-fmu_resource::fmu_resource(fs::path path)
+fmu_resource::fmu_resource(std::filesystem::path path)
     : path_(std::move(path))
 {}
 
@@ -37,7 +37,7 @@ std::string fmu_resource::get_model_description_xml() const
 fmu_resource::~fmu_resource()
 {
     std::error_code success;
-    fs::remove_all(path_, success);
+    remove_all(path_, success);
 
     if (!success) {
         MLOG_DEBUG("Deleted temporal folder '" + path_.string() + "'");
diff --git a/src/fmi4cpp/library_helper.hpp b/src/fmi4cpp/library_helper.hpp
index dd6ee5e..e695c7c 100644
--- a/src/fmi4cpp/library_helper.hpp
+++ b/src/fmi4cpp/library_helper.hpp
@@ -3,18 +3,19 @@
 #define FMI4CPP_LIBRARYHELPER_HPP
 
 #include <fmi4cpp/dll_handle.hpp>
-#include <fmi4cpp/fs_portability.hpp>
+
+#include <filesystem>
 #include <sstream>
 
-namespace
+namespace fmi4cpp
 {
 
-DLL_HANDLE load_library(const std::string& libName)
+inline DLL_HANDLE load_library(const std::string& libName)
 {
     std::string dllDirectory;
 
 #ifdef _WIN32
-    fmi4cpp::fs::path path(libName);
+    std::filesystem::path path(libName);
     if (path.has_parent_path()) {
         dllDirectory = path.parent_path().string();
     }
@@ -48,7 +49,7 @@ T load_function(DLL_HANDLE handle, const char* function_name)
 #endif
 }
 
-bool free_library(DLL_HANDLE handle)
+inline bool free_library(DLL_HANDLE handle)
 {
 #ifdef WIN32
     return static_cast<bool>(FreeLibrary(handle));
@@ -57,7 +58,7 @@ bool free_library(DLL_HANDLE handle)
 #endif
 }
 
-std::string getLastError()
+inline std::string getLastError()
 {
 #ifdef WIN32
     std::ostringstream os;
diff --git a/src/fmi4cpp/tools/unzipper.hpp b/src/fmi4cpp/tools/unzipper.hpp
index 3d33788..77d467e 100644
--- a/src/fmi4cpp/tools/unzipper.hpp
+++ b/src/fmi4cpp/tools/unzipper.hpp
@@ -2,19 +2,16 @@
 #ifndef FMI4CPP_UNZIPPER_HPP
 #define FMI4CPP_UNZIPPER_HPP
 
-#include <fmi4cpp/fs_portability.hpp>
-
 #include <zip.h>
 
+#include <filesystem>
 #include <fstream>
-#include <iostream>
-#include <sstream>
 #include <string>
 
-namespace
+namespace fmi4cpp
 {
 
-bool unzip(const fmi4cpp::fs::path& zip_file, const fmi4cpp::fs::path& tmp_path)
+inline bool unzip(const std::filesystem::path& zip_file, const std::filesystem::path& tmp_path)
 {
     int* err = nullptr;
     zip* za = zip_open(absolute(zip_file).string().c_str(), 0, err);
@@ -34,13 +31,13 @@ bool unzip(const fmi4cpp::fs::path& zip_file, const fmi4cpp::fs::path& tmp_path)
     for (int i = 0; i < zip_get_num_entries(za, 0); i++) {
         if (zip_stat_index(za, i, 0, &sb) == 0) {
 
-            const fmi4cpp::fs::path newFile = tmp_path / sb.name;
+            const std::filesystem::path newFile = tmp_path / sb.name;
 
             if (sb.size == 0) {
-                fmi4cpp::fs::create_directories(newFile);
+                create_directories(newFile);
             } else {
                 const auto containingDirectory = newFile.parent_path();
-                if (!fmi4cpp::fs::exists(containingDirectory) && !fmi4cpp::fs::create_directories(containingDirectory)) {
+                if (!exists(containingDirectory) && !create_directories(containingDirectory)) {
                     return false;
                 }
                 zf = zip_fopen_index(za, i, 0);
@@ -67,6 +64,6 @@ bool unzip(const fmi4cpp::fs::path& zip_file, const fmi4cpp::fs::path& tmp_path)
     return true;
 }
 
-} // namespace
+} // namespace fmi4cpp
 
 #endif // FMI4CPP_UNZIPPER_HPP

From 641a5cb7d13d2bae07976ca3f1553a8b57e1e41b Mon Sep 17 00:00:00 2001
From: Lars Ivar Hatledal <larsivarhatledal@gmail.com>
Date: Thu, 3 Oct 2024 09:59:25 +0200
Subject: [PATCH 3/3] cleanup

---
 include/fmi4cpp/fmi2/fmu.hpp              | 4 ++--
 include/fmi4cpp/fmi2/me_instance.hpp      | 2 +-
 include/fmi4cpp/fmu_base.hpp              | 2 ++
 include/fmi4cpp/fmu_instance.hpp          | 4 ++--
 include/fmi4cpp/fmu_variable_accessor.hpp | 4 ++++
 src/fmi4cpp/fmi2/me_instance.cpp          | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/fmi4cpp/fmi2/fmu.hpp b/include/fmi4cpp/fmi2/fmu.hpp
index 128f488..bc5f996 100644
--- a/include/fmi4cpp/fmi2/fmu.hpp
+++ b/include/fmi4cpp/fmi2/fmu.hpp
@@ -22,13 +22,13 @@ class fmu : public virtual fmu_provider<model_description, cs_fmu, me_fmu>
 
 private:
     std::shared_ptr<fmu_resource> resource_;
-    std::shared_ptr<const fmi4cpp::fmi2::model_description> modelDescription_;
+    std::shared_ptr<const model_description> modelDescription_;
 
 public:
     explicit fmu(const std::filesystem::path& fmuPath);
 
     [[nodiscard]] std::string get_model_description_xml() const;
-    [[nodiscard]] std::shared_ptr<const fmi4cpp::fmi2::model_description> get_model_description() const override;
+    [[nodiscard]] std::shared_ptr<const model_description> get_model_description() const override;
 
     [[nodiscard]] bool supports_me() const override;
     [[nodiscard]] bool supports_cs() const override;
diff --git a/include/fmi4cpp/fmi2/me_instance.hpp b/include/fmi4cpp/fmi2/me_instance.hpp
index 6623ac6..b707b2d 100644
--- a/include/fmi4cpp/fmi2/me_instance.hpp
+++ b/include/fmi4cpp/fmi2/me_instance.hpp
@@ -48,7 +48,7 @@ class me_instance : public fmu_instance_base<me_library, me_model_description>
 
     [[nodiscard]] DLL_HANDLE handle() const override;
 
-    [[nodiscard]] fmi4cpp::status last_status() const override;
+    [[nodiscard]] status last_status() const override;
 };
 
 } // namespace fmi4cpp::fmi2
diff --git a/include/fmi4cpp/fmu_base.hpp b/include/fmi4cpp/fmu_base.hpp
index 5019e30..6d83f0b 100644
--- a/include/fmi4cpp/fmu_base.hpp
+++ b/include/fmi4cpp/fmu_base.hpp
@@ -24,6 +24,8 @@ class fmu_base
     }
 
     virtual std::shared_ptr<const ModelDescription> get_model_description() const = 0;
+
+    virtual ~fmu_base() = default;
 };
 
 template<class model_description, class cs_fmu, class me_fmu>
diff --git a/include/fmi4cpp/fmu_instance.hpp b/include/fmi4cpp/fmu_instance.hpp
index 1b132a2..1a8aa06 100644
--- a/include/fmi4cpp/fmu_instance.hpp
+++ b/include/fmi4cpp/fmu_instance.hpp
@@ -28,7 +28,7 @@ class fmu_instance : public fmu_variable_accessor
 
     [[nodiscard]] virtual DLL_HANDLE handle() const = 0;
 
-    [[nodiscard]] virtual fmi4cpp::status last_status() const = 0;
+    [[nodiscard]] virtual status last_status() const = 0;
 
     virtual std::shared_ptr<const ModelDescription> get_model_description() const = 0;
 
@@ -56,7 +56,7 @@ class fmu_instance : public fmu_variable_accessor
         const std::vector<fmi4cppReal>& dvKnownRef,
         std::vector<fmi4cppReal>& dvUnknownRef) = 0;
 
-    virtual ~fmu_instance() = default;
+    ~fmu_instance() override = default;
 };
 
 } // namespace fmi4cpp
diff --git a/include/fmi4cpp/fmu_variable_accessor.hpp b/include/fmi4cpp/fmu_variable_accessor.hpp
index 77a94a1..21ce833 100644
--- a/include/fmi4cpp/fmu_variable_accessor.hpp
+++ b/include/fmi4cpp/fmu_variable_accessor.hpp
@@ -24,6 +24,8 @@ class fmu_reader
 
     virtual bool read_boolean(fmi4cppValueReference vr, fmi4cppBoolean& ref) = 0;
     virtual bool read_boolean(const std::vector<fmi4cppValueReference>& vr, std::vector<fmi4cppBoolean>& ref) = 0;
+
+    virtual ~fmu_reader() = default;
 };
 
 class fmu_writer
@@ -49,6 +51,8 @@ class fmu_writer
     virtual bool write_boolean(
         const std::vector<fmi4cppValueReference>& vr,
         const std::vector<fmi4cppBoolean>& values) = 0;
+
+    virtual ~fmu_writer() = default;
 };
 
 class fmu_variable_accessor : public fmu_reader, public fmu_writer
diff --git a/src/fmi4cpp/fmi2/me_instance.cpp b/src/fmi4cpp/fmi2/me_instance.cpp
index 772400e..9a818c3 100644
--- a/src/fmi4cpp/fmi2/me_instance.cpp
+++ b/src/fmi4cpp/fmi2/me_instance.cpp
@@ -5,7 +5,7 @@
 using namespace fmi4cpp::fmi2;
 
 me_instance::me_instance(fmi2Component c,
-    const std::shared_ptr<fmi4cpp::fmu_resource>& resource,
+    const std::shared_ptr<fmu_resource>& resource,
     const std::shared_ptr<me_library>& library,
     const std::shared_ptr<const me_model_description>& modelDescription)
     : fmu_instance_base<me_library, me_model_description>(c, resource, library, modelDescription)