Skip to content

Commit

Permalink
More various cleanups (#2621)
Browse files Browse the repository at this point in the history
  • Loading branch information
StephanTLavavej authored Apr 4, 2022
1 parent 2aabd75 commit baef903
Showing 12 changed files with 20 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/update-status-chart.yml
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout gh-pages
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: gh-pages
- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ">=17.5.0"
node-version: ">=17.8.0"
- name: Install Packages
run: |
npm ci
4 changes: 2 additions & 2 deletions stl/inc/charconv
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ _STL_DISABLE_CLANG_WARNINGS
_STD_BEGIN
inline constexpr char _Charconv_digits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e',
'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
static_assert(_STD size(_Charconv_digits) == 36);
_STL_INTERNAL_STATIC_ASSERT(_STD size(_Charconv_digits) == 36);

template <class _RawTy>
_NODISCARD to_chars_result _Integer_to_chars(
@@ -226,7 +226,7 @@ _NODISCARD inline unsigned char _Digit_from_char(const char _Ch) noexcept {
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
255, 255, 255, 255, 255, 255, 255, 255, 255};
static_assert(_STD size(_Digit_from_byte) == 256);
_STL_INTERNAL_STATIC_ASSERT(_STD size(_Digit_from_byte) == 256);

return _Digit_from_byte[static_cast<unsigned char>(_Ch)];
}
1 change: 1 addition & 0 deletions stl/inc/codecvt
Original file line number Diff line number Diff line change
@@ -216,6 +216,7 @@ protected:
template <class _Elem, unsigned long _Mymax = 0x10ffff, codecvt_mode _Mymode = codecvt_mode{}>
class _CXX17_DEPRECATE_CODECVT_HEADER codecvt_utf16 : public codecvt<_Elem, char, _Statype> {
// facet for converting between _Elem and UTF-16 multibyte sequences
private:
enum { _Bytes_per_word = 2 };

public:
2 changes: 1 addition & 1 deletion stl/inc/cwctype
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ _STL_DISABLE_CLANG_WARNINGS
#pragma push_macro("new")
#undef new

// remove any (improper) macro overrides
// TRANSITION, /clr:pure (see corecrt_wctype.h): remove any (improper) macro overrides
#undef iswalnum
#undef iswalpha
#undef iswblank
7 changes: 7 additions & 0 deletions stl/inc/future
Original file line number Diff line number Diff line change
@@ -884,6 +884,7 @@ class shared_future;
template <class _Ty>
class future : public _State_manager<_Ty> {
// class that defines a non-copyable asynchronous return object that holds a value
private:
using _Mybase = _State_manager<_Ty>;

public:
@@ -920,6 +921,7 @@ public:
template <class _Ty>
class future<_Ty&> : public _State_manager<_Ty*> {
// class that defines a non-copyable asynchronous return object that holds a reference
private:
using _Mybase = _State_manager<_Ty*>;

public:
@@ -953,6 +955,7 @@ public:
template <>
class future<void> : public _State_manager<int> {
// class that defines a non-copyable asynchronous return object that does not hold a value
private:
using _Mybase = _State_manager<int>;

public:
@@ -984,6 +987,7 @@ public:
template <class _Ty>
class shared_future : public _State_manager<_Ty> {
// class that defines a copyable asynchronous return object that holds a value
private:
using _Mybase = _State_manager<_Ty>;

public:
@@ -1019,6 +1023,7 @@ public:
template <class _Ty>
class shared_future<_Ty&> : public _State_manager<_Ty*> {
// class that defines a copyable asynchronous return object that holds a reference
private:
using _Mybase = _State_manager<_Ty*>;

public:
@@ -1051,6 +1056,7 @@ public:
template <>
class shared_future<void> : public _State_manager<int> {
// class that defines a copyable asynchronous return object that does not hold a value
private:
using _Mybase = _State_manager<int>;

public:
@@ -1473,6 +1479,7 @@ class _Fake_no_copy_callable_adapter {
// std::function, which requires that things be copyable. We can't fix this in an
// update, so this adapter turns copies into terminate(). When VSO-153581 is
// fixed, remove this adapter.
private:
using _Storaget = tuple<decay_t<_Types>...>;

public:
1 change: 1 addition & 0 deletions stl/inc/shared_mutex
Original file line number Diff line number Diff line change
@@ -74,6 +74,7 @@ private:
// shared_timed_mutex is not supported under /clr
#ifndef _M_CEE
class shared_timed_mutex { // class for mutual exclusion shared across threads
private:
using _Read_cnt_t = unsigned int;

static constexpr _Read_cnt_t _Max_readers = static_cast<_Read_cnt_t>(-1);
1 change: 0 additions & 1 deletion stl/inc/sstream
Original file line number Diff line number Diff line change
@@ -420,7 +420,6 @@ protected:
return pos_type(_Off);
}

protected:
void _Init(const _Elem* _Ptr, _Mysize_type _Count, int _State) {
// initialize buffer to [_Ptr, _Ptr + _Count), set state
_State &= ~_From_rvalue;
2 changes: 1 addition & 1 deletion stl/inc/variant
Original file line number Diff line number Diff line change
@@ -1472,7 +1472,7 @@ struct _Variant_dispatcher<index_sequence<_Is...>> {
template <class _Ret, class _Callable, class... _Types, bool _Any_valueless = ((_Is == 0) || ...)>
_NODISCARD static constexpr _Ret _Dispatch2(_Callable&& _Obj, _Types&&... _Args) {
if constexpr (_Any_valueless) {
((void) _Args, ...); // TRANSITION, DevCom-1004719
((void) _Args, ...); // TRANSITION, VSO-1513409
_Throw_bad_variant_access();
}
#if _HAS_CXX20
1 change: 1 addition & 0 deletions stl/inc/vector
Original file line number Diff line number Diff line change
@@ -2246,6 +2246,7 @@ public:
template <class _Alvbase_wrapped>
class _Vb_reference : public _Vb_iter_base<_Alvbase_wrapped> {
// reference to a bit within a base word
private:
using _Mybase = _Vb_iter_base<_Alvbase_wrapped>;
using _Mycont = typename _Mybase::_Mycont;
using _Difference_type = typename _Mybase::_Difference_type;
1 change: 1 addition & 0 deletions stl/inc/xmemory
Original file line number Diff line number Diff line change
@@ -1639,6 +1639,7 @@ namespace ranges {
template <class _Alloc>
class _NODISCARD _Uninitialized_backout_al {
// struct to undo partially constructed ranges in _Uninitialized_xxx_al algorithms
private:
using pointer = _Alloc_ptr_t<_Alloc>;

public:
1 change: 0 additions & 1 deletion stl/inc/xtree
Original file line number Diff line number Diff line change
@@ -933,7 +933,6 @@ public:
_Swap_val_excluding_comp(_Right);
}

public:
_Tree& operator=(_Tree&& _Right) noexcept(
_Choose_pocma_v<_Alnode> == _Pocma_values::_Equal_allocators && is_nothrow_move_assignable_v<key_compare>) {
if (this == _STD addressof(_Right)) {
4 changes: 2 additions & 2 deletions tests/libcxx/expected_results.txt
Original file line number Diff line number Diff line change
@@ -932,13 +932,13 @@ std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp FAIL
std/containers/sequences/vector/vector.cons/deduct.pass.cpp FAIL

# Not yet analyzed. Seems to force a sign conversion error?
std/iterators/iterator.primitives/iterator.operations/advance.pass.cpp FAIL
std/iterators/iterator.primitives/iterator.operations/advance.pass.cpp SKIPPED

# Not yet analyzed. Maybe Clang over-eagerly instantiating noexcept-specifier?
std/ranges/range.access/empty.pass.cpp:1 FAIL
std/ranges/range.access/size.pass.cpp:1 FAIL
std/ranges/range.access/ssize.pass.cpp:1 FAIL
std/utilities/memory/unique.ptr/iterator_concept_conformance.compile.pass.cpp:1 FAIL
std/utilities/memory/unique.ptr/iterator_concept_conformance.compile.pass.cpp:1 SKIPPED

# *** XFAILs WHICH PASS ***
# Nothing here! :-)

0 comments on commit baef903

Please sign in to comment.