replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt to fix MSVC build broken by r294326 

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

llvm-svn: 294327
This commit is contained in:
Pavel Labath 2017-02-07 18:35:36 +00:00
parent 24cb6548e5
commit c1ec4c9187
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
llvm/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
llvm/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;