Skip to content

Avoid conflict with ICU macroizing _No #1570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 1 commit into from
Jan 20, 2021
Merged

Avoid conflict with ICU macroizing _No #1570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions stl/inc/memory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2082,10 +2082,10 @@ struct _Alignas_storage_unit {
alignas(_Align) char _Space[_Align];
};

enum class _Check_overflow : bool { _No, _Yes };
enum class _Check_overflow : bool { _Nope, _Yes };

template <class _Refc, _Check_overflow _Check>
_NODISCARD size_t _Calculate_bytes_for_flexible_array(const size_t _Count) noexcept(_Check == _Check_overflow::_No) {
_NODISCARD size_t _Calculate_bytes_for_flexible_array(const size_t _Count) noexcept(_Check == _Check_overflow::_Nope) {
constexpr size_t _Align = alignof(_Refc);

size_t _Bytes = sizeof(_Refc); // contains storage for one element
Expand Down Expand Up @@ -2691,7 +2691,7 @@ private:

_Rebind_alloc_t<_Alloc, _Storage> _Al(this->_Get_val());
const size_t _Bytes =
_Calculate_bytes_for_flexible_array<_Ref_count_unbounded_array_alloc, _Check_overflow::_No>(_Size);
_Calculate_bytes_for_flexible_array<_Ref_count_unbounded_array_alloc, _Check_overflow::_Nope>(_Size);
const size_t _Storage_units = _Bytes / sizeof(_Storage);

this->~_Ref_count_unbounded_array_alloc();
Expand Down
2 changes: 1 addition & 1 deletion stl/inc/xlocale
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3242,7 +3242,7 @@ protected:
};

// FUNCTION TEMPLATE _Getloctxt
enum class _Case_sensitive : bool { _No, _Yes };
enum class _Case_sensitive : bool { _Nope, _Yes };

template <class _InIt, class _Elem>
int __CRTDECL _Getloctxt(
Expand Down
6 changes: 3 additions & 3 deletions stl/inc/xloctime
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ protected:

virtual _InIt __CLR_OR_THIS_CALL do_get_weekday(_InIt _First, _InIt _Last, ios_base&, ios_base::iostate& _State,
tm* _Pt) const { // get weekday from [_First, _Last) into _Pt
int _Num = _Getloctxt(_First, _Last, 0, _Days, _Case_sensitive::_No);
int _Num = _Getloctxt(_First, _Last, 0, _Days, _Case_sensitive::_Nope);
if (_Num < 0) {
_State |= ios_base::failbit;
} else {
Expand All @@ -338,7 +338,7 @@ protected:

virtual _InIt __CLR_OR_THIS_CALL do_get_monthname(_InIt _First, _InIt _Last, ios_base&, ios_base::iostate& _State,
tm* _Pt) const { // get month from [_First, _Last) into _Pt
int _Num = _Getloctxt(_First, _Last, 0, _Months, _Case_sensitive::_No);
int _Num = _Getloctxt(_First, _Last, 0, _Months, _Case_sensitive::_Nope);

if (_Num < 0) {
_State |= ios_base::failbit;
Expand Down Expand Up @@ -444,7 +444,7 @@ protected:
break;

case 'p':
_Ans = _Getloctxt(_First, _Last, 0, ":AM:am:PM:pm", _Case_sensitive::_No);
_Ans = _Getloctxt(_First, _Last, 0, ":AM:am:PM:pm", _Case_sensitive::_Nope);
if (_Ans < 0) {
_State |= ios_base::failbit;
} else if (1 < _Ans) {
Expand Down