summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support/Chrono.cpp
diff options
context:
space:
mode:
authorKristof Beyls <kristof.beyls@arm.com>2017-03-30 11:06:25 +0000
committerKristof Beyls <kristof.beyls@arm.com>2017-03-30 11:06:25 +0000
commit7a76b315d6dfeed6791de5aa04ec1b8a6ba8ed19 (patch)
treeaebbd34cd087ddb6894c94df3ba2f05e36f98926 /llvm/lib/Support/Chrono.cpp
parent1ba115a113ec7ca2f6df0edad112b4479860de81 (diff)
downloadbcm5719-llvm-7a76b315d6dfeed6791de5aa04ec1b8a6ba8ed19.tar.gz
bcm5719-llvm-7a76b315d6dfeed6791de5aa04ec1b8a6ba8ed19.zip
Revert "Make naming in Host.h in line with coding standards."
This reverts r299062, which caused build failures on Windows. It also reverts the attempts to fix the windows builds in r299064 and r299065. The introduction of namespace llvm::sys::detail makes MSVC, and seemingly also mingw, complain about ambiguity with the existing namespace llvm::detail. E.g.: C:\b\slave\sanitizer-windows\llvm\include\llvm/Support/MathExtras.h(184): error C2872: 'detail': ambiguous symbol C:\b\slave\sanitizer-windows\llvm\include\llvm/Support/PointerLikeTypeTraits.h(31): note: could be 'llvm::detail' C:\b\slave\sanitizer-windows\llvm\include\llvm/Support/Host.h(80): note: or 'llvm::sys::detail' In r299064 and r299065 I tried to fix these ambiguities, based on the errors reported in the log files. It seems however that the build stops early when this kind of error is encountered, and many build-then-fix-iterations on Windows may be needed to fix this. Therefore reverting r299062 for now to get the build working again on Windows. llvm-svn: 299066
Diffstat (limited to 'llvm/lib/Support/Chrono.cpp')
-rw-r--r--llvm/lib/Support/Chrono.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Support/Chrono.cpp b/llvm/lib/Support/Chrono.cpp
index daccaf1fc10..ca748f5c046 100644
--- a/llvm/lib/Support/Chrono.cpp
+++ b/llvm/lib/Support/Chrono.cpp
@@ -16,12 +16,12 @@ namespace llvm {
using namespace sys;
-const char llvm::detail::unit<std::ratio<3600>>::value[] = "h";
-const char llvm::detail::unit<std::ratio<60>>::value[] = "m";
-const char llvm::detail::unit<std::ratio<1>>::value[] = "s";
-const char llvm::detail::unit<std::milli>::value[] = "ms";
-const char llvm::detail::unit<std::micro>::value[] = "us";
-const char llvm::detail::unit<std::nano>::value[] = "ns";
+const char detail::unit<std::ratio<3600>>::value[] = "h";
+const char detail::unit<std::ratio<60>>::value[] = "m";
+const char detail::unit<std::ratio<1>>::value[] = "s";
+const char detail::unit<std::milli>::value[] = "ms";
+const char detail::unit<std::micro>::value[] = "us";
+const char detail::unit<std::nano>::value[] = "ns";
static inline struct tm getStructTM(TimePoint<> TP) {
struct tm Storage;
OpenPOWER on IntegriCloud