From 6f04e4ca46e6f2dcd3eda63529a1bbd915f7676b Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 28 Dec 2018 03:02:57 +0100
Subject: clang-tidy fixes only

Maybe global `-Wcomma' is too harsh.

There should be no functional changes whatsoever.
---
 logic/runtime-libraries.cpp | 9 +++++++++
 logic/work.cpp              | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'logic')

diff --git a/logic/runtime-libraries.cpp b/logic/runtime-libraries.cpp
index b91c9635..097540c2 100644
--- a/logic/runtime-libraries.cpp
+++ b/logic/runtime-libraries.cpp
@@ -12,6 +12,11 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dyli
 
     with_tracker_teardown sentinel;
 
+#ifdef __clang__
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wcomma"
+#endif
+
     pProtocol = make_dylib_instance<IProtocol>(p);
 
     if (!pProtocol)
@@ -57,6 +62,10 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dyli
         goto end;
     }
 
+#ifdef __clang__
+#   pragma clang diagnostic pop
+#endif
+
     correct = true;
     return;
 
diff --git a/logic/work.cpp b/logic/work.cpp
index da61b348..e0c13ac8 100644
--- a/logic/work.cpp
+++ b/logic/work.cpp
@@ -53,7 +53,7 @@ std::unique_ptr<TrackLogger> Work::make_logger(main_settings &s)
                     QMessageBox::Ok, QMessageBox::NoButton);
             }
             else
-                return logger;
+                return std::move(logger);
         }
     }
 
-- 
cgit v1.2.3