Fix covertiy issues for COPY_INSTEAD_OF_MOVE and GLOBAL_INIT_ORDER

Change-Id: I2b581ccae0488203377bc2d4fc696bd6380b39bb

diff --git a/include/klay/audit/logger.h b/include/klay/audit/logger.h
index 4d75623c07fb0f96dc9f4f322398d82594800a9e..3333aef33876b7d7984655347ed921bce2c6fa7c 100644 (file)
--- a/include/klay/audit/logger.h
+++ b/include/klay/audit/logger.h
@@ -67,7 +67,7 @@ do {                                                                   \
        audit::LogRecord record = { audit::LogLevel::level,                \
                                                                __FILENAME__, __LINE__, __func__,      \
                                                                FORMAT(message) };                     \
-       audit::Logger::log(logsink, record);                               \
+       audit::Logger::log(logsink, std::move(record));                               \
 } while (0)
 
 #define ERROR2(logsink, message) LOG(logsink, message, Error)

diff --git a/src/testbench/test-driver.cpp b/src/testbench/test-driver.cpp
index 5b6628a3de346bf5e6f36d174e71428c78d15ce6..ab897dbaae2999b09964ede855488864e0e35e53 100644 (file)
--- a/src/testbench/test-driver.cpp
+++ b/src/testbench/test-driver.cpp
@@ -19,16 +19,16 @@
 namespace klay {
 namespace testbench {
 
-std::unique_ptr<TestDriver> TestDriver::instance = nullptr;
 std::once_flag TestDriver::flag;
 
 TestDriver& TestDriver::GetInstance()
 {
+       static std::unique_ptr<TestDriver> instance = nullptr;
        std::call_once(TestDriver::flag, []() {
-               TestDriver::instance.reset(new TestDriver);
+               instance.reset(new TestDriver);
        });
 
-       return *TestDriver::instance;
+       return *instance;
 }
 
 void TestDriver::addTestCase(TestCase* testCase) noexcept