Include <cmeow> instead of <meow.h>

stl/inc/__msvc_all_public_headers.hpp

@@ -37,18 +37,52 @@
 #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
 #define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
 
+// Core STL Headers
+#include <bit>
+#include <compare>
+#include <concepts>
+#include <coroutine>
+#include <initializer_list>
+#include <limits>
+#include <numbers>
+#include <ratio>
+#include <type_traits>
+#include <utility>
+#include <version>
+
+// Core C Wrapper Headers
+#include <cassert>
+#include <cctype>
+#include <cerrno>
+#include <cfenv>
+#include <cfloat>
+#include <cinttypes>
+#include <climits>
+#include <clocale>
+#include <csetjmp>
+#include <csignal>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <cuchar>
+#include <cwchar>
+#include <cwctype>
+
+#ifndef _EXCLUDE_NON_CORE_HEADERS
+
+// Non-Core STL Headers
 #include <algorithm>
 #include <any>
 #include <array>
-#include <bit>
 #include <bitset>
 #include <charconv>
 #include <chrono>
 #include <codecvt>
-#include <compare>
 #include <complex>
-#include <concepts>
-#include <coroutine>
 #include <deque>
 #include <exception>
 #include <filesystem>
@@ -57,28 +91,24 @@
 #include <functional>
 #include <hash_map>
 #include <hash_set>
-#include <initializer_list>
 #include <iomanip>
 #include <ios>
 #include <iosfwd>
 #include <iostream>
 #include <istream>
 #include <iterator>
-#include <limits>
 #include <list>
 #include <locale>
 #include <map>
 #include <memory>
 #include <memory_resource>
 #include <new>
-#include <numbers>
 #include <numeric>
 #include <optional>
 #include <ostream>
 #include <queue>
 #include <random>
 #include <ranges>
-#include <ratio>
 #include <regex>
 #include <scoped_allocator>
 #include <set>
@@ -92,16 +122,13 @@
 #include <strstream>
 #include <system_error>
 #include <tuple>
-#include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
-#include <utility>
 #include <valarray>
 #include <variant>
 #include <vector>
-#include <version>
 
 #ifndef _M_CEE_PURE
 #include <atomic>
@@ -120,32 +147,15 @@
 #include <thread>
 #endif // _M_CEE
 
-#include <cassert>
+// Non-Core C Wrapper Headers
 #include <ccomplex>
-#include <cctype>
-#include <cerrno>
-#include <cfenv>
-#include <cfloat>
-#include <cinttypes>
 #include <ciso646>
-#include <climits>
-#include <clocale>
 #include <cmath>
-#include <csetjmp>
-#include <csignal>
 #include <cstdalign>
-#include <cstdarg>
 #include <cstdbool>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include <ctgmath>
-#include <ctime>
-#include <cuchar>
-#include <cwchar>
-#include <cwctype>
+
+// Non-Core Experimental Headers
 #include <experimental/deque>
 #include <experimental/filesystem>
 #include <experimental/forward_list>
@@ -157,9 +167,10 @@
 #include <experimental/unordered_set>
 #include <experimental/vector>
 
+#endif // _EXCLUDE_NON_CORE_HEADERS
+
 #ifndef _MSVC_TESTING_NVCC
 #include <assert.h>
-#include <complex.h>
 #include <conio.h>
 #include <crtdbg.h>
 #include <ctype.h>
@@ -181,7 +192,6 @@
 #include <mbstring.h>
 #include <memory.h>
 #include <minmax.h>
-#include <new.h>
 #include <process.h>
 #include <safeint.h>
 #include <sal.h>
@@ -207,6 +217,11 @@
 #include <wchar.h>
 #include <wctype.h>
 
+#ifndef _EXCLUDE_NON_CORE_HEADERS
+#include <complex.h>
+#include <new.h>
+#endif // _EXCLUDE_NON_CORE_HEADERS
+
 #ifndef _M_CEE_PURE
 #include <fpieee.h>
 #endif // _M_CEE_PURE

stl/inc/cassert

@@ -1,9 +1,9 @@
-// cassert standard header
+// cassert standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // NOTE: no include guard
-#include <yvals.h>
+#include <yvals_core.h>
 
 #include <assert.h>

stl/inc/cctype

@@ -1,12 +1,12 @@
-// cctype standard header
+// cctype standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CCTYPE_
 #define _CCTYPE_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <ctype.h>

stl/inc/cerrno

@@ -1,12 +1,12 @@
-// cerrno standard header
+// cerrno standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CERRNO_
 #define _CERRNO_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <errno.h>

stl/inc/cfenv

@@ -1,12 +1,12 @@
-// cfenv standard header
+// cfenv standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CFENV_
 #define _CFENV_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <fenv.h>

stl/inc/charconv

@@ -12,7 +12,6 @@
 #if !_HAS_CXX17
 #pragma message("The contents of <charconv> are available only with C++17 or later.")
 #else // ^^^ !_HAS_CXX17 / _HAS_CXX17 vvv
-#include <cfloat>
 #include <cstring>
 #include <intrin0.h>
 #include <xbit_ops.h>

stl/inc/cinttypes

@@ -1,12 +1,12 @@
-// cinttypes standard header
+// cinttypes standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CINTTYPES_
 #define _CINTTYPES_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <cstdint>

stl/inc/clocale

@@ -1,12 +1,12 @@
-// clocale standard header
+// clocale standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CLOCALE_
 #define _CLOCALE_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <locale.h>

stl/inc/csetjmp

@@ -1,12 +1,12 @@
-// csetjmp standard header
+// csetjmp standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CSETJMP_
 #define _CSETJMP_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <setjmp.h>

stl/inc/csignal

@@ -1,12 +1,12 @@
-// csignal standard header
+// csignal standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CSIGNAL_
 #define _CSIGNAL_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <signal.h>

stl/inc/cstdarg

@@ -1,12 +1,12 @@
-// cstdarg standard header
+// cstdarg standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CSTDARG_
 #define _CSTDARG_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <stdarg.h>

stl/inc/cstring

@@ -1,12 +1,12 @@
-// cstring standard header
+// cstring standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CSTRING_
 #define _CSTRING_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <string.h>

stl/inc/ctime

@@ -1,12 +1,12 @@
-// ctime standard header
+// ctime standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CTIME_
 #define _CTIME_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <time.h>

stl/inc/cuchar

@@ -1,12 +1,12 @@
-// cuchar standard header
+// cuchar standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CUCHAR_
 #define _CUCHAR_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <uchar.h>

stl/inc/cwctype

@@ -1,12 +1,12 @@
-// cwctype standard header
+// cwctype standard header (core)
 
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
 #ifndef _CWCTYPE_
 #define _CWCTYPE_
-#include <yvals.h>
+#include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <wctype.h>

stl/inc/tuple

@@ -8,7 +8,6 @@
 #define _TUPLE_
 #include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
-#include <new>
 #include <type_traits>
 #include <xutility>
 

stl/src/xstol.cpp

@@ -10,8 +10,6 @@
 #include <climits>
 #include <cstdlib>
 
-#include "xmath.hpp"
-
 _EXTERN_C_UNLESS_PURE
 
 _CRTIMP2_PURE unsigned long __CLRCALL_PURE_OR_CDECL _Stoulx(const char*, char**, int, int*);