From 07781ac8e49ed802d962419a2fd08910d68f9bf5 Mon Sep 17 00:00:00 2001
From: Michalis Spyrou <michalis.spyrou@arm.com>
Date: Thu, 31 Aug 2017 15:11:41 +0100
Subject: COMPMID-518 - Bare metal support

Change-Id: Ida6d3dc46476fd9a67b5860e5e5bf8b848a8ac23
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/85981
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
---
 support/ToolchainSupport.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'support/ToolchainSupport.h')

diff --git a/support/ToolchainSupport.h b/support/ToolchainSupport.h
index c73f2486e1..87e9bd2bc8 100644
--- a/support/ToolchainSupport.h
+++ b/support/ToolchainSupport.h
@@ -40,7 +40,7 @@ namespace support
 {
 namespace cpp11
 {
-#ifdef __ANDROID__
+#if(__ANDROID__ || BARE_METAL)
 /** Convert integer and float values to string.
  *
  * @note This function implements the same behaviour as std::to_string. The
@@ -154,7 +154,7 @@ inline T copysign(T x, T y)
 {
     return ::copysign(x, y);
 }
-#else  /* __ANDROID__ */
+#else  /* (__ANDROID__ || BARE_METAL) */
 /** Convert integer and float values to string.
  *
  * @note This function acts as a convenience wrapper around std::to_string. The
@@ -260,7 +260,7 @@ inline T copysign(T x, T y)
 {
     return std::copysign(x, y);
 }
-#endif /* __ANDROID__ */
+#endif /* (__ANDROID__ || BARE_METAL) */
 
 inline std::string to_string(bool value)
 {
-- 
cgit v1.2.1