Merge branch 'master' of github.com:HowardHinnant/date

This commit is contained in:
Howard Hinnant 2016-02-19 18:48:33 -05:00
commit 08e55b5de3

10
date.h
View File

@ -805,6 +805,12 @@ public:
{}
};
#ifdef __GNUC__
// GCC complains about __int128 with -pedantic or -pedantic-errors
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#endif
template <class T>
struct choose_trunc_type
{
@ -826,6 +832,10 @@ struct choose_trunc_type
>::type;
};
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
template <class T>
CONSTCD11
inline