diff options
| author | Pavel Labath <labath@google.com> | 2017-02-07 18:35:36 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2017-02-07 18:35:36 +0000 |
| commit | c1ec4c91873d3eeda1c9a3ba62668455a0c0d545 (patch) | |
| tree | 4153377e68935b87e5540c7877b7f5ab7dd165bf /llvm/lib/Support/Chrono.cpp | |
| parent | 24cb6548e5fbf22841128db4cdcbaef2bf64f1b8 (diff) | |
| download | bcm5719-llvm-c1ec4c91873d3eeda1c9a3ba62668455a0c0d545.tar.gz bcm5719-llvm-c1ec4c91873d3eeda1c9a3ba62668455a0c0d545.zip | |
Attempt to fix MSVC build broken by r294326
MSVC does not think that `char []` can be constexpr. Switch to regular const.
llvm-svn: 294327
Diffstat (limited to 'llvm/lib/Support/Chrono.cpp')
| -rw-r--r-- | llvm/lib/Support/Chrono.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Support/Chrono.cpp b/llvm/lib/Support/Chrono.cpp index ef81edc9269..ca748f5c046 100644 --- a/llvm/lib/Support/Chrono.cpp +++ b/llvm/lib/Support/Chrono.cpp @@ -16,12 +16,12 @@ namespace llvm { using namespace sys; -constexpr char detail::unit<std::ratio<3600>>::value[]; -constexpr char detail::unit<std::ratio<60>>::value[]; -constexpr char detail::unit<std::ratio<1>>::value[]; -constexpr char detail::unit<std::milli>::value[]; -constexpr char detail::unit<std::micro>::value[]; -constexpr char detail::unit<std::nano>::value[]; +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; |
