summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2018-06-01 14:59:22 -0700
committerPirama Arumuga Nainar <pirama@google.com>2018-06-25 11:47:52 -0700
commit8e52362e45c7d14d30c158e3c5f05e53e499bea4 (patch)
tree48d37481a07181150f34ebca2b50f345ea0aa055 /base
parent7982178b7bb877ab967f861896ab543d1002a943 (diff)
downloadsystem_core-8e52362e45c7d14d30c158e3c5f05e53e499bea4.tar.gz
system_core-8e52362e45c7d14d30c158e3c5f05e53e499bea4.tar.bz2
system_core-8e52362e45c7d14d30c158e3c5f05e53e499bea4.zip
Adapt to switch to Clang for Windows host builds
Bug: http://b/69933068 Bug: http://b/91353691: std::chrono_utils is not available in the libstdc++ in the mingw/gcc prebuilts. They can be used once we switch to using libc++ for Windows host. Test: m native-host-cross with Clang Change-Id: If9f0f1f201d5e4e445890075ad64c2d6086b0491
Diffstat (limited to 'base')
-rw-r--r--base/include/android-base/chrono_utils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/include/android-base/chrono_utils.h b/base/include/android-base/chrono_utils.h
index c3396ee2f..b7647f22c 100644
--- a/base/include/android-base/chrono_utils.h
+++ b/base/include/android-base/chrono_utils.h
@@ -20,7 +20,7 @@
#include <chrono>
#include <sstream>
-#if __cplusplus > 201103L // C++14
+#if __cplusplus > 201103L && !defined(__WIN32) // C++14
using namespace std::chrono_literals;
#endif