This is an archive of the discontinued LLVM Phabricator instance.

Differential D93283

[libcxx] Remove ifdefs in the message to static_assert. NFC.
ClosedPublic

Authored by mstorsjo on Dec 14 2020, 11:20 PM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rG08a00c6f43c1: [libcxx] Remove ifdefs in the message to static_assert. NFC.
Summary

As suggested in D91137.

Diff Detail

Event Timeline

mstorsjo requested review of this revision.Dec 14 2020, 11:20 PM
mstorsjo created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptDec 14 2020, 11:20 PM
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B82402: Diff 311801.Dec 14 2020, 11:21 PM
Mordante added a subscriber: Mordante.Dec 15 2020, 9:34 AM

LGTM, once it passes CI.

ldionne accepted this revision.Dec 15 2020, 1:19 PM
ldionne added a subscriber: ldionne.

Thanks!

This revision is now accepted and ready to land.Dec 15 2020, 1:19 PM
mstorsjo updated this revision to Diff 312414.Dec 17 2020, 2:11 AM
mstorsjo removed rG LLVM Github Monorepo as the repository for this revision.
mstorsjo set the repository for this revision to rG LLVM Github Monorepo.

Rerunning CI

Harbormaster completed remote builds in B82755: Diff 312414.Dec 17 2020, 3:34 AM
Closed by commit rG08a00c6f43c1: [libcxx] Remove ifdefs in the message to static_assert. NFC. (authored by mstorsjo). · Explain WhyDec 17 2020, 3:38 AM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG08a00c6f43c1: [libcxx] Remove ifdefs in the message to static_assert. NFC..
mstorsjo mentioned this in D91136: [4/N] [libcxx] Reorder the two u8path functions, to make the following diff more readable. NFC..Dec 17 2020, 3:52 AM

Revision Contents

PathSize
libcxx/
include/
11 lines

Diff 312414

libcxx/include/filesystem

Show First 20 Lines • Show All 991 Lines • ▼ Show 20 Lines
typename enable_if<__is_pathable<_Source>::value, path>::type typename enable_if<__is_pathable<_Source>::value, path>::type
u8path(const _Source& __s) { u8path(const _Source& __s) {
static_assert( static_assert(
#ifndef _LIBCPP_NO_HAS_CHAR8_T #ifndef _LIBCPP_NO_HAS_CHAR8_T
is_same<typename __is_pathable<_Source>::__char_type, char8_t>::value || is_same<typename __is_pathable<_Source>::__char_type, char8_t>::value ||
#endif #endif
is_same<typename __is_pathable<_Source>::__char_type, char>::value, is_same<typename __is_pathable<_Source>::__char_type, char>::value,
"u8path(Source const&) requires Source have a character type of type " "u8path(Source const&) requires Source have a character type of type "
"'char'" "'char' or 'char8_t'");
#ifndef _LIBCPP_NO_HAS_CHAR8_T
" or 'char8_t'"
#endif
);
return path(__s); return path(__s);
} }
template <class _InputIt> template <class _InputIt>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_WITH_CHAR8_T _LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_WITH_CHAR8_T
typename enable_if<__is_pathable<_InputIt>::value, path>::type typename enable_if<__is_pathable<_InputIt>::value, path>::type
u8path(_InputIt __f, _InputIt __l) { u8path(_InputIt __f, _InputIt __l) {
static_assert( static_assert(
#ifndef _LIBCPP_NO_HAS_CHAR8_T #ifndef _LIBCPP_NO_HAS_CHAR8_T
is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value || is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
#endif #endif
is_same<typename __is_pathable<_InputIt>::__char_type, char>::value, is_same<typename __is_pathable<_InputIt>::__char_type, char>::value,
"u8path(Iter, Iter) requires Iter have a value_type of type 'char'" "u8path(Iter, Iter) requires Iter have a value_type of type 'char'"
#ifndef _LIBCPP_NO_HAS_CHAR8_T " or 'char8_t'");
" or 'char8_t'"
#endif
);
return path(__f, __l); return path(__f, __l);
} }
class _LIBCPP_TYPE_VIS path::iterator { class _LIBCPP_TYPE_VIS path::iterator {
public: public:
enum _ParserState : unsigned char { enum _ParserState : unsigned char {
_Singular, _Singular,
_BeforeBegin, _BeforeBegin,
▲ Show 20 Lines • Show All 991 Lines • Show Last 20 Lines