RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-23 19:59:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt to fix MSVC build broken by r294326

Browse Source 
MSVC does not think that `char []` can be constexpr. Switch to regular const.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294327 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Pavel Labath 2017-02-07 18:35:36 +00:00
parent 6f3190d682
commit 6997bd2426
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/llvm/Support/Chrono.h
View File

@ -76,21 +76,15 @@ raw_ostream &operator<<(raw_ostream &OS, sys::TimePoint<> TP);
/// display unit or you request that the unit is not displayed.
namespace detail {
template <typename Period> struct unit { static constexpr char value[] = ""; };
template <typename Period> constexpr char unit<Period>::value[];
template <typename Period> struct unit { static const char value[]; };
template <typename Period> const char unit<Period>::value[] = "";
template <> struct unit<std::ratio<3600>> {
static constexpr char value[] = "h";
};
template <> struct unit<std::ratio<60>> {
static constexpr char value[] = "m";
};
template <> struct unit<std::ratio<1>> { static constexpr char value[] = "s"; };
template <> struct unit<std::milli> { static constexpr char value[] = "ms"; };
template <> struct unit<std::micro> { static constexpr char value[] = "us"; };
template <> struct unit<std::nano> { static constexpr char value[] = "ns"; };
template <> struct unit<std::ratio<3600>> { static const char value[]; };
template <> struct unit<std::ratio<60>> { static const char value[]; };
template <> struct unit<std::ratio<1>> { static const char value[]; };
template <> struct unit<std::milli> { static const char value[]; };
template <> struct unit<std::micro> { static const char value[]; };
template <> struct unit<std::nano> { static const char value[]; };
} // namespace detail
template <typename Rep, typename Period>

12
lib/Support/Chrono.cpp
View File

@ -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;