From 03ae842e887834b49ff2ee22d1d681c5772f3687 Mon Sep 17 00:00:00 2001
From: David Heejong Park <hee.jong.park@dnv.com>
Date: Wed, 9 Feb 2022 17:29:20 +0100
Subject: [PATCH] Fixed init ordering error and missing ctor used in the test.

---
 include/cosim/fmi/importer.hpp  | 2 +-
 include/cosim/orchestration.hpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/cosim/fmi/importer.hpp b/include/cosim/fmi/importer.hpp
index ae2d2743..a15ba081 100644
--- 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
index c60051d8..46886438 100644
--- 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;