Skip to content

Fuse <xstddef> into <type_traits> #3654

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
Apr 20, 2023
Merged

Fuse <xstddef> into <type_traits> #3654

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
1 change: 0 additions & 1 deletion stl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ set(HEADERS
${CMAKE_CURRENT_LIST_DIR}/inc/xnode_handle.h
${CMAKE_CURRENT_LIST_DIR}/inc/xpolymorphic_allocator.h
${CMAKE_CURRENT_LIST_DIR}/inc/xsmf_control.h
${CMAKE_CURRENT_LIST_DIR}/inc/xstddef
${CMAKE_CURRENT_LIST_DIR}/inc/xstring
${CMAKE_CURRENT_LIST_DIR}/inc/xthreads.h
${CMAKE_CURRENT_LIST_DIR}/inc/xtimec.h
Expand Down
1 change: 0 additions & 1 deletion stl/inc/header-units.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@
"xnode_handle.h",
"xpolymorphic_allocator.h",
"xsmf_control.h",
"xstddef",
"xstring",
"xthreads.h",
"xtimec.h",
Expand Down
7 changes: 6 additions & 1 deletion stl/inc/type_traits
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
#define _TYPE_TRAITS_
#include <yvals_core.h>
#if _STL_COMPILER_PREPROCESSOR
#include <cstddef>
#include <cstdint>
#include <xstddef>
#include <xtr1common>

#pragma pack(push, _CRT_PACKING)
#pragma warning(push, _STL_WARNING_LEVEL)
Expand All @@ -19,6 +20,10 @@ _STL_DISABLE_CLANG_WARNINGS
#undef new

_STD_BEGIN
template <class>
// TRANSITION, CWG-2518: false value attached to a dependent name (for static_assert)
_INLINE_VAR constexpr bool _Always_false = false;

_EXPORT_STD template <class _Ty, _Ty... _Vals>
struct integer_sequence { // sequence of integer parameters
static_assert(is_integral_v<_Ty>, "integer_sequence<T, I...> requires T to be an integral type.");
Expand Down
32 changes: 0 additions & 32 deletions stl/inc/xstddef
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/std/tests/GH_001411_core_headers/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

// <__msvc_iter_core.hpp> is included by <tuple>
// <xkeycheck.h> should not be included outside of <yvals_core.h>
// <xstddef> is included by <type_traits>
// <xtr1common> is included by <cstddef>
// <yvals_core.h> is included by every public core header

Expand Down
2 changes: 1 addition & 1 deletion tests/std/tests/VSO_0000000_instantiate_iterators_misc/test.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1624,7 +1624,7 @@ void typeindex_test() {

template <typename FunctorArg, typename Arg>
void functors_test_impl(Arg val) {
// Following from <xstddef>:
// Following from <type_traits> and <xutility>:
(void) plus<FunctorArg>()(val, val);
(void) minus<FunctorArg>()(val, val);
(void) multiplies<FunctorArg>()(val, val);
Expand Down
2 changes: 1 addition & 1 deletion tests/std/tests/VSO_0000000_instantiate_type_traits/test.compile.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void type_traits_test_impl() {
TRAIT_V(is_null_pointer, T);
TRAIT_V(is_union, T);
TRAIT_V(is_class, T);
TRAIT_V(is_function, T); // from xstddef
TRAIT_V(is_function, T);
TRAIT_V(is_fundamental, T);
TRAIT_V(is_arithmetic, T); // from xtr1common
TRAIT_V(is_object, T);
Expand Down