maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[libc++] Fix compilation error on platforms that don't implement std::tm 

Instead of mentioning tm directly in the definition of __convert_to_tm,
take it as a template argument. As a fly-by also fix incorrect Lit feature
(should have been no-localization instead of libcpp-has-no-localization).

Differential Revision: https://reviews.llvm.org/D133490
This commit is contained in:
Louis Dionne 2022-09-08 09:53:49 -04:00 committed by Louis Dionne
parent 48203b327d
commit d529e8110b
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcxx/include/__chrono/convert_to_tm.h
View File

@ -13,7 +13,6 @@
#include <__chrono/day.h>
#include <__concepts/same_as.h>
#include <__config>
#include <ctime>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
@ -23,17 +22,19 @@ _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17
template <class _Tp>
_LIBCPP_HIDE_FROM_ABI tm __convert_to_tm(const _Tp& __value) {
tm __result = {};
// Convert a chrono calendar time point to the given tm type,
// which must have the same properties as std::tm.
template <class _Tm, class _ChronoCalendarTimePoint>
_LIBCPP_HIDE_FROM_ABI _Tm __convert_to_tm(const _ChronoCalendarTimePoint& __value) {
_Tm __result = {};
# ifdef __GLIBC__
__result.tm_zone = "UTC";
# endif
if constexpr (same_as<_Tp, chrono::day>)
if constexpr (same_as<_ChronoCalendarTimePoint, chrono::day>)
__result.tm_mday = static_cast<unsigned>(__value);
else
static_assert(sizeof(_Tp) == 0, "Add the missing type specialization");
static_assert(sizeof(_ChronoCalendarTimePoint) == 0, "Add the missing type specialization");
return __result;
}

2
libcxx/include/__chrono/formatter.h
View File

@ -55,7 +55,7 @@ namespace __formatter {
template <class _CharT, class _Tp>
_LIBCPP_HIDE_FROM_ABI void __format_chrono_using_chrono_specs(
const _Tp& __value, basic_stringstream<_CharT>& __sstr, basic_string_view<_CharT> __chrono_specs) {
tm __t = std::__convert_to_tm(__value);
tm __t = std::__convert_to_tm<tm>(__value);
const auto& __facet = std::use_facet<time_put<_CharT>>(__sstr.getloc());
for (auto __it = __chrono_specs.begin(); __it != __chrono_specs.end(); ++__it) {
if (*__it == _CharT('%')) {

2
libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/ostream.pass.cpp
View File

@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03, c++11, c++14, c++17
// UNSUPPORTED: libcpp-has-no-localization
// UNSUPPORTED: no-localization
// UNSUPPORTED: libcpp-has-no-incomplete-format
// TODO FMT Investigate Windows issues.

2
libcxx/test/std/time/time.syn/formatter.day.pass.cpp
View File

@ -6,7 +6,7 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03, c++11, c++14, c++17
// UNSUPPORTED: libcpp-has-no-localization
// UNSUPPORTED: no-localization
// UNSUPPORTED: libcpp-has-no-incomplete-format
// TODO FMT Investigate Windows issues.