From e874ef9b845424dceeac4211ca9dfec24949f03c Mon Sep 17 00:00:00 2001
From: Georgios Pinitas <georgios.pinitas@arm.com>
Date: Mon, 9 Sep 2019 17:40:33 +0100
Subject: COMPMID-2646: Wrap thread-related structure to ease bare-metal
 support

Wraps "lock_guard" and "unique_lock" to ease bare-metal support.
Adds basic armclang compilation flow.

Change-Id: I44ccd042652acd6a9b442c57c879db3891abb0e2
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1923
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
---
 arm_compute/core/utils/logging/IPrinter.h         | 2 +-
 arm_compute/core/utils/logging/LogMsgDecorators.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'arm_compute/core/utils/logging')

diff --git a/arm_compute/core/utils/logging/IPrinter.h b/arm_compute/core/utils/logging/IPrinter.h
index 2f399102e2..45ea8368eb 100644
--- a/arm_compute/core/utils/logging/IPrinter.h
+++ b/arm_compute/core/utils/logging/IPrinter.h
@@ -55,7 +55,7 @@ public:
      */
     inline void print(const std::string &msg)
     {
-        std::lock_guard<arm_compute::Mutex> lock(_mtx);
+        arm_compute::lock_guard<arm_compute::Mutex> lock(_mtx);
         print_internal(msg);
     }
 
diff --git a/arm_compute/core/utils/logging/LogMsgDecorators.h b/arm_compute/core/utils/logging/LogMsgDecorators.h
index 32cb977bf2..03a2d41f12 100644
--- a/arm_compute/core/utils/logging/LogMsgDecorators.h
+++ b/arm_compute/core/utils/logging/LogMsgDecorators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 ARM Limited.
+ * Copyright (c) 2016-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -30,7 +30,9 @@
 #include <chrono>
 #include <ctime>
 #include <string>
+#ifndef NO_MULTI_THREADING
 #include <thread>
+#endif /* NO_MULTI_THREADING */
 
 namespace arm_compute
 {
-- 
cgit v1.2.1