Fixed init ordering error and missing ctor used in the test.

open-simulation-platform · Feb 9, 2022 · 03ae842 · 03ae842
1 parent f9ea42c
commit 03ae842
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/cosim/fmi/importer.hpp b/include/cosim/fmi/importer.hpp
@@ -63,7 +63,6 @@ class importer : public std::enable_shared_from_this<importer>
     // Private constructors, to force use of factory functions.
     explicit importer(std::shared_ptr<file_cache> cache, bool disable_fmi_logging);
 
-    bool disable_fmi_logging;
 public:
     /**
      *  Imports and loads an FMU.
@@ -112,6 +111,7 @@ class importer : public std::enable_shared_from_this<importer>
 
     std::map<cosim::filesystem::path, std::weak_ptr<fmu>> pathCache_;
     std::map<std::string, std::weak_ptr<fmu>> guidCache_;
+    bool disable_fmi_logging;
 };
 
 

diff --git a/include/cosim/orchestration.hpp b/include/cosim/orchestration.hpp
@@ -172,9 +172,9 @@ class model_uri_resolver
 class fmu_file_uri_sub_resolver : public model_uri_sub_resolver
 {
 public:
-    explicit fmu_file_uri_sub_resolver(bool disable_fmi_logging);
+    explicit fmu_file_uri_sub_resolver(bool disable_fmi_logging = false);
 
-    explicit fmu_file_uri_sub_resolver(std::shared_ptr<file_cache> cache, bool disable_fmi_logging);
+    explicit fmu_file_uri_sub_resolver(std::shared_ptr<file_cache> cache, bool disable_fmi_logging = false);
 
     std::shared_ptr<model> lookup_model(const uri& modelUri) override;