Fix MSVC compilation

albin-johansson · Feb 3, 2024 · 54f9e46 · 54f9e46
1 parent 5252bac
commit 54f9e46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/modules/core/inc/tactile/core/model/model.hpp b/modules/core/inc/tactile/core/model/model.hpp
@@ -27,7 +27,7 @@ class TACTILE_CORE_API Model final {
 
  private:
   Settings mSettings {};
-  LanguageMap mLanguages;
+  LanguageMap mLanguages {};
 };
 
 }  // namespace tactile::core
diff --git a/modules/core/inc/tactile/core/ui/i18n/language.hpp b/modules/core/inc/tactile/core/ui/i18n/language.hpp
@@ -22,11 +22,6 @@ namespace tactile::core {
  */
 class TACTILE_CORE_API Language final {
  public:
-  TACTILE_DELETE_COPY(Language);
-  TACTILE_DEFAULT_MOVE(Language);
-
-  ~Language() noexcept = default;
-
   /**
    * Attempts to parse a language file.
    *

diff --git a/modules/core/src/tactile/core/editor_app.cpp b/modules/core/src/tactile/core/editor_app.cpp
@@ -34,13 +34,15 @@ EditorApp::EditorApp(IWindow* window, IRenderer* renderer)
   ImGui::StyleColorsDark(&style);
   apply_custom_style(style);
 
+  // NOLINTNEXTLINE(*-unused-return-value)
   load_languages("assets/lang")
       .transform([this](LanguageMap&& languages) {
         mModel->set_languages(std::move(languages));
       })
       .transform_error([](const ErrorCode& error_code) {
         TACTILE_LOG_ERROR("Could not load translation files: {}", error_code.message());
         throw Exception {"Could not load translation files"};
+        return error_code;
       });
 }