From 5fb3b0a06d1bd998e319a833704e4d005cb7d5fa Mon Sep 17 00:00:00 2001 From: David Larson Date: Fri, 4 Sep 2020 20:24:43 -0700 Subject: [PATCH 1/7] Change deprecated headers to modern equivalents and remove unused headers. --- stl/src/StlCompareStringA.cpp | 1 - stl/src/StlCompareStringW.cpp | 4 ---- stl/src/StlLCMapStringA.cpp | 1 - stl/src/StlLCMapStringW.cpp | 3 --- stl/src/_tolower.cpp | 7 +++---- stl/src/_toupper.cpp | 6 +++--- stl/src/cond.cpp | 3 +-- stl/src/cthread.cpp | 8 +++---- stl/src/excptptr.cpp | 2 -- stl/src/filesys.cpp | 1 - stl/src/filesystem.cpp | 9 ++++---- stl/src/future.cpp | 1 - stl/src/instances.cpp | 8 ------- stl/src/ios.cpp | 39 ----------------------------------- stl/src/locale0.cpp | 2 +- stl/src/mpiostream.cpp | 1 - stl/src/mutex.cpp | 4 ++-- stl/src/nothrow.cpp | 2 -- stl/src/ppltasks.cpp | 1 - stl/src/primitives.hpp | 1 - stl/src/special_math.cpp | 4 ---- stl/src/taskscheduler.cpp | 1 - stl/src/thread0.cpp | 2 +- stl/src/vector_algorithms.cpp | 1 - stl/src/winapinls.cpp | 3 +-- stl/src/winapisupp.cpp | 6 ++---- stl/src/xferaise.cpp | 2 +- stl/src/xfprec.cpp | 1 - stl/src/xgetwctype.cpp | 2 +- stl/src/xlock.cpp | 4 ++-- stl/src/xlprec.cpp | 1 - stl/src/xmath.hpp | 4 +--- stl/src/xmbtowc.cpp | 9 +++----- stl/src/xmtx.hpp | 2 +- stl/src/xnotify.cpp | 3 +-- stl/src/xprec.cpp | 1 - stl/src/xrngabort.cpp | 4 ++-- stl/src/xstod.cpp | 2 +- stl/src/xstof.cpp | 2 +- stl/src/xstoflt.cpp | 6 +++--- stl/src/xstol.cpp | 8 +++---- stl/src/xstold.cpp | 2 +- stl/src/xstoll.cpp | 8 +++---- stl/src/xstopfx.cpp | 2 +- stl/src/xstoul.cpp | 15 +++++++------- stl/src/xstoull.cpp | 14 ++++++------- stl/src/xstoxflt.cpp | 8 +++---- stl/src/xstrcoll.cpp | 8 +++---- stl/src/xstrxfrm.cpp | 7 +++---- stl/src/xtime.cpp | 2 -- stl/src/xtowlower.cpp | 2 +- stl/src/xtowupper.cpp | 2 +- stl/src/xwcscoll.cpp | 7 +++---- stl/src/xwcsxfrm.cpp | 8 +++---- stl/src/xwctomb.cpp | 10 ++++----- stl/src/xwstod.cpp | 4 ++-- stl/src/xwstof.cpp | 2 +- stl/src/xwstoflt.cpp | 6 +++--- stl/src/xwstold.cpp | 2 +- stl/src/xwstopfx.cpp | 2 +- stl/src/xwstoxfl.cpp | 8 +++---- stl/src/xxdftype.hpp | 2 +- stl/src/xxfftype.hpp | 2 +- stl/src/xxlftype.hpp | 2 +- stl/src/xxxprec.hpp | 2 +- 65 files changed, 102 insertions(+), 197 deletions(-) diff --git a/stl/src/StlCompareStringA.cpp b/stl/src/StlCompareStringA.cpp index 977838a3768..7b634390747 100644 --- a/stl/src/StlCompareStringA.cpp +++ b/stl/src/StlCompareStringA.cpp @@ -3,7 +3,6 @@ #include #include -#include #include diff --git a/stl/src/StlCompareStringW.cpp b/stl/src/StlCompareStringW.cpp index d4c80042608..6af12562bd3 100644 --- a/stl/src/StlCompareStringW.cpp +++ b/stl/src/StlCompareStringW.cpp @@ -1,10 +1,6 @@ // Copyright (c) Microsoft Corporation. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include -#include -#include - #include #include "awint.hpp" diff --git a/stl/src/StlLCMapStringA.cpp b/stl/src/StlLCMapStringA.cpp index bb5651e3bce..0b1a72d3c8f 100644 --- a/stl/src/StlLCMapStringA.cpp +++ b/stl/src/StlLCMapStringA.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception #include -#include #include "awint.hpp" diff --git a/stl/src/StlLCMapStringW.cpp b/stl/src/StlLCMapStringW.cpp index d388a2a7770..bc3bc35ad7a 100644 --- a/stl/src/StlLCMapStringW.cpp +++ b/stl/src/StlLCMapStringW.cpp @@ -1,9 +1,6 @@ // Copyright (c) Microsoft Corporation. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include -#include - #include "awint.hpp" // int __cdecl __crtLCMapStringW - Get type information about a wide string. diff --git a/stl/src/_tolower.cpp b/stl/src/_tolower.cpp index 21d35f55a10..6d91a498b0f 100644 --- a/stl/src/_tolower.cpp +++ b/stl/src/_tolower.cpp @@ -5,11 +5,10 @@ #include -#include +#include +#include +#include #include -#include -#include -#include #include #include "awint.hpp" diff --git a/stl/src/_toupper.cpp b/stl/src/_toupper.cpp index e0cc01cc5af..78953a811a6 100644 --- a/stl/src/_toupper.cpp +++ b/stl/src/_toupper.cpp @@ -5,9 +5,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include "awint.hpp" diff --git a/stl/src/cond.cpp b/stl/src/cond.cpp index 49f79e4633e..c619d264dea 100644 --- a/stl/src/cond.cpp +++ b/stl/src/cond.cpp @@ -3,9 +3,8 @@ // condition variable functions +#include #include -#include -#include #include #include #include diff --git a/stl/src/cthread.cpp b/stl/src/cthread.cpp index 7b144c82151..5a66e009874 100644 --- a/stl/src/cthread.cpp +++ b/stl/src/cthread.cpp @@ -3,11 +3,11 @@ // thread functions +#include +#include +#include +#include #include -#include -#include -#include -#include #include #include diff --git a/stl/src/excptptr.cpp b/stl/src/excptptr.cpp index 6b5879e328b..7c996a76265 100644 --- a/stl/src/excptptr.cpp +++ b/stl/src/excptptr.cpp @@ -18,9 +18,7 @@ #include #include #include -#include #include -#include #include #include diff --git a/stl/src/filesys.cpp b/stl/src/filesys.cpp index 2ec30bdad0d..8b1f308ba23 100644 --- a/stl/src/filesys.cpp +++ b/stl/src/filesys.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include diff --git a/stl/src/filesystem.cpp b/stl/src/filesystem.cpp index cb81206ad2a..96ec870a09c 100644 --- a/stl/src/filesystem.cpp +++ b/stl/src/filesystem.cpp @@ -9,16 +9,15 @@ // Do not include or define anything else here. // In particular, basic_string must not be included here. +#include #include +#include +#include #include -#include -#include -#include -#include #include #include -#include +#include // We have several switches that do not have case statements for every possible enum value. // Hence, disabling this warning. diff --git a/stl/src/future.cpp b/stl/src/future.cpp index 77264b2de59..5ff6f82f924 100644 --- a/stl/src/future.cpp +++ b/stl/src/future.cpp @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include #include #include diff --git a/stl/src/instances.cpp b/stl/src/instances.cpp index 96a8dedc47b..e85f9e90ec0 100644 --- a/stl/src/instances.cpp +++ b/stl/src/instances.cpp @@ -5,15 +5,7 @@ #define __FORCE_INSTANCE -#include -#include -#include -#include -#include #include -#include -#include -#include #include _STD_BEGIN diff --git a/stl/src/ios.cpp b/stl/src/ios.cpp index 9f15c44dc4a..8640a63169b 100644 --- a/stl/src/ios.cpp +++ b/stl/src/ios.cpp @@ -3,7 +3,6 @@ // ios_base basic members -#include #include _STD_BEGIN @@ -26,20 +25,6 @@ __PURE_APPDOMAIN_GLOBAL static ios_base* stdstr[_Nstdstr + 2] = { nullptr}; // [1, _Nstdstr] hold pointers to standard streams __PURE_APPDOMAIN_GLOBAL static char stdopens[_Nstdstr + 2] = {0}; // [1, _Nstdstr] hold open counts for standard streams -// void __CLR_OR_THIS_CALL ios_base::clear(iostate state, bool reraise) { // set state, possibly reraise exception -// _Mystate = (iostate)(state & _Statmask); -// if ((_Mystate & _Except) == 0) -// ; -// else if (reraise) -// _RERAISE; -// else if (_Mystate & _Except & badbit) -// _THROW(failure("ios_base::badbit set")); -// else if (_Mystate & _Except & failbit) -// _THROW(failure("ios_base::failbit set")); -// else -// _THROW(failure("ios_base::eofbit set")); -// } - void __CLRCALL_PURE_OR_CDECL ios_base::_Ios_base_dtor(ios_base* _This) { // destroy the object if (0 < _This->_Stdstr && 0 < --stdopens[_This->_Stdstr]) { return; @@ -49,30 +34,6 @@ void __CLRCALL_PURE_OR_CDECL ios_base::_Ios_base_dtor(ios_base* _This) { // dest delete _This->_Ploc; } -// ios_base::_Iosarray& __CLR_OR_THIS_CALL ios_base::_Findarr(int idx) { // locate or make a variable array element -// static _Iosarray stub(0, 0); -// _Iosarray *p, *q; -// -// if (idx < 0) { // handle bad index -// setstate(badbit); -// return stub; -// } -// -// for (p = _Arr, q = 0; p != 0; p = p->_Next) -// if (p->_Index == idx) -// return *p; // found element, return it -// else if (q == 0 && p->_Lo == 0 && p->_Vp == 0) -// q = p; // found recycling candidate -// -// if (q != 0) { // recycle existing element -// q->_Index = idx; -// return *q; -// } -// -// _Arr = new _Iosarray(idx, _Arr); // make a new element -// return *_Arr; -// } - void __CLRCALL_PURE_OR_CDECL ios_base::_Addstd(ios_base* _This) { // add standard stream to destructor list _BEGIN_LOCK(_LOCK_STREAM) for (_This->_Stdstr = 1; _This->_Stdstr < _Nstdstr; ++_This->_Stdstr) { diff --git a/stl/src/locale0.cpp b/stl/src/locale0.cpp index 46a6f679fe3..acd2fc944a2 100644 --- a/stl/src/locale0.cpp +++ b/stl/src/locale0.cpp @@ -73,8 +73,8 @@ _STD_END #if !STDCPP_IMPLIB || defined(_M_CEE_PURE) +#include #include -#include _EXTERN_C diff --git a/stl/src/mpiostream.cpp b/stl/src/mpiostream.cpp index cbc2b38c93e..a0d1818eafd 100644 --- a/stl/src/mpiostream.cpp +++ b/stl/src/mpiostream.cpp @@ -6,7 +6,6 @@ #error This file must be built with /clr:pure. #endif -#include #include #pragma warning(disable : 4074) diff --git a/stl/src/mutex.cpp b/stl/src/mutex.cpp index 79ca2067e08..8749f4544b9 100644 --- a/stl/src/mutex.cpp +++ b/stl/src/mutex.cpp @@ -3,9 +3,9 @@ // mutex functions +#include +#include #include -#include -#include #include #include #include diff --git a/stl/src/nothrow.cpp b/stl/src/nothrow.cpp index 6e01ef81976..d12dcdcf336 100644 --- a/stl/src/nothrow.cpp +++ b/stl/src/nothrow.cpp @@ -11,8 +11,6 @@ #undef MRTDLL #endif -#include - #include _STD_BEGIN diff --git a/stl/src/ppltasks.cpp b/stl/src/ppltasks.cpp index 95a5a011dbe..b603576f41e 100644 --- a/stl/src/ppltasks.cpp +++ b/stl/src/ppltasks.cpp @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include #include #include #include diff --git a/stl/src/primitives.hpp b/stl/src/primitives.hpp index 2f335143af1..799b1c8d4bf 100644 --- a/stl/src/primitives.hpp +++ b/stl/src/primitives.hpp @@ -9,7 +9,6 @@ #include #include #include -#include #include diff --git a/stl/src/special_math.cpp b/stl/src/special_math.cpp index e824c10b2e1..c53f9a76b9a 100644 --- a/stl/src/special_math.cpp +++ b/stl/src/special_math.cpp @@ -23,16 +23,12 @@ #include #include #include -#include #include #include #include #include -#include #include -#include #include -#include #pragma warning(pop) diff --git a/stl/src/taskscheduler.cpp b/stl/src/taskscheduler.cpp index 105a7f05ec8..9c0a698ea36 100644 --- a/stl/src/taskscheduler.cpp +++ b/stl/src/taskscheduler.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include diff --git a/stl/src/thread0.cpp b/stl/src/thread0.cpp index a4067600697..e385909a311 100644 --- a/stl/src/thread0.cpp +++ b/stl/src/thread0.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include #include diff --git a/stl/src/vector_algorithms.cpp b/stl/src/vector_algorithms.cpp index 4823e4fdd9d..9c7fc413e99 100644 --- a/stl/src/vector_algorithms.cpp +++ b/stl/src/vector_algorithms.cpp @@ -11,7 +11,6 @@ #include #include #include -#include extern "C" long __isa_enabled; diff --git a/stl/src/winapinls.cpp b/stl/src/winapinls.cpp index a7a47a51348..7ff49097a25 100644 --- a/stl/src/winapinls.cpp +++ b/stl/src/winapinls.cpp @@ -6,8 +6,7 @@ #if _STL_WIN32_WINNT < _WIN32_WINNT_VISTA #include -#include -#include +#include #include namespace { diff --git a/stl/src/winapisupp.cpp b/stl/src/winapisupp.cpp index 9275e307f8c..aa6e3bce7c3 100644 --- a/stl/src/winapisupp.cpp +++ b/stl/src/winapisupp.cpp @@ -4,18 +4,16 @@ // clang-format off // Prevent clang-format from reordering before #include -#include #include "awint.hpp" #include -#include +#include // clang-format on #pragma warning(push) #pragma warning(disable : 4265) // non-virtual destructor in base class #include #pragma warning(pop) -#include -#include +#include #if !defined(_CRT_WINDOWS) && !defined(UNDOCKED_WINDOWS_UCRT) // GetCurrentPackageId retrieves the current package id, if the app is deployed via a package. diff --git a/stl/src/xferaise.cpp b/stl/src/xferaise.cpp index b1683d6e194..68d8bbbf82a 100644 --- a/stl/src/xferaise.cpp +++ b/stl/src/xferaise.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include _EXTERN_C_UNLESS_PURE diff --git a/stl/src/xfprec.cpp b/stl/src/xfprec.cpp index 31ca4b8aad1..4c4e438e406 100644 --- a/stl/src/xfprec.cpp +++ b/stl/src/xfprec.cpp @@ -3,6 +3,5 @@ // _FXp* functions -#include "xmath.hpp" #include "xxfftype.hpp" #include "xxxprec.hpp" diff --git a/stl/src/xgetwctype.cpp b/stl/src/xgetwctype.cpp index b3e444a2376..2063e0cfded 100644 --- a/stl/src/xgetwctype.cpp +++ b/stl/src/xgetwctype.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include #include "awint.hpp" diff --git a/stl/src/xlock.cpp b/stl/src/xlock.cpp index 1ffa80e9362..e6274ddd3e5 100644 --- a/stl/src/xlock.cpp +++ b/stl/src/xlock.cpp @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include #include "xmtx.hpp" diff --git a/stl/src/xlprec.cpp b/stl/src/xlprec.cpp index 3061c43c846..34963b7bee6 100644 --- a/stl/src/xlprec.cpp +++ b/stl/src/xlprec.cpp @@ -3,6 +3,5 @@ // _LXp* functions -#include "xmath.hpp" #include "xxlftype.hpp" #include "xxxprec.hpp" diff --git a/stl/src/xmath.hpp b/stl/src/xmath.hpp index 200d7a9d981..9d89959283e 100644 --- a/stl/src/xmath.hpp +++ b/stl/src/xmath.hpp @@ -3,9 +3,7 @@ #ifndef _XMATH #define _XMATH -#include -#include -#include +#include #include // FLOAT PROPERTIES diff --git a/stl/src/xmbtowc.cpp b/stl/src/xmbtowc.cpp index 5bc58a872cf..d415eeb8c5a 100644 --- a/stl/src/xmbtowc.cpp +++ b/stl/src/xmbtowc.cpp @@ -3,14 +3,11 @@ // Convert multibyte char to wide char. +#include +#include +#include // for INT_MAX #include -#include -#include #include -#include // for INT_MAX -#include -#include // for EOF -#include #include // for _Cvtvec, _Mbrtowc _EXTERN_C_UNLESS_PURE diff --git a/stl/src/xmtx.hpp b/stl/src/xmtx.hpp index f891af3175f..9380716a3c0 100644 --- a/stl/src/xmtx.hpp +++ b/stl/src/xmtx.hpp @@ -6,7 +6,7 @@ #define _XMTX #include -#include +#include #include diff --git a/stl/src/xnotify.cpp b/stl/src/xnotify.cpp index bf362c717ea..64a513855d9 100644 --- a/stl/src/xnotify.cpp +++ b/stl/src/xnotify.cpp @@ -3,8 +3,7 @@ // thread exit notification functions -#include -#include +#include #include #include diff --git a/stl/src/xprec.cpp b/stl/src/xprec.cpp index 4097ba6a9fa..cb7eaa21f20 100644 --- a/stl/src/xprec.cpp +++ b/stl/src/xprec.cpp @@ -3,6 +3,5 @@ // _Xp* functions -#include "xmath.hpp" #include "xxdftype.hpp" #include "xxxprec.hpp" diff --git a/stl/src/xrngabort.cpp b/stl/src/xrngabort.cpp index b221d651871..87642321b95 100644 --- a/stl/src/xrngabort.cpp +++ b/stl/src/xrngabort.cpp @@ -5,8 +5,8 @@ #include -#include -#include +#include +#include // clang-format off _STD_BEGIN diff --git a/stl/src/xstod.cpp b/stl/src/xstod.cpp index 821cd15fb8a..34425729a3c 100644 --- a/stl/src/xstod.cpp +++ b/stl/src/xstod.cpp @@ -5,7 +5,7 @@ #include // include first, for native shared -#include +#include #include "xmath.hpp" #include "xxcctype.hpp" diff --git a/stl/src/xstof.cpp b/stl/src/xstof.cpp index 0c98e1a855f..1f0107573d3 100644 --- a/stl/src/xstof.cpp +++ b/stl/src/xstof.cpp @@ -5,7 +5,7 @@ #include // include first, for native shared -#include +#include #include "xmath.hpp" #include "xxcctype.hpp" diff --git a/stl/src/xstoflt.cpp b/stl/src/xstoflt.cpp index 57dfdaf5707..3a9b6adf214 100644 --- a/stl/src/xstoflt.cpp +++ b/stl/src/xstoflt.cpp @@ -3,9 +3,9 @@ // _Stoflt function -#include -#include -#include +#include +#include +#include #include "xmath.hpp" diff --git a/stl/src/xstol.cpp b/stl/src/xstol.cpp index 35a9e052fee..3cd73becd64 100644 --- a/stl/src/xstol.cpp +++ b/stl/src/xstol.cpp @@ -5,10 +5,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "xmath.hpp" diff --git a/stl/src/xstold.cpp b/stl/src/xstold.cpp index f8a66cb8827..cea4090ffc4 100644 --- a/stl/src/xstold.cpp +++ b/stl/src/xstold.cpp @@ -5,7 +5,7 @@ #include // include first, for native shared -#include +#include #include "xmath.hpp" #include "xxcctype.hpp" diff --git a/stl/src/xstoll.cpp b/stl/src/xstoll.cpp index af01eeb597c..63ad80e1493 100644 --- a/stl/src/xstoll.cpp +++ b/stl/src/xstoll.cpp @@ -3,10 +3,10 @@ // _Stoll function -#include -#include -#include -#include +#include +#include +#include +#include #include "xmath.hpp" diff --git a/stl/src/xstopfx.cpp b/stl/src/xstopfx.cpp index b9d44fe14b6..207b4cd7c61 100644 --- a/stl/src/xstopfx.cpp +++ b/stl/src/xstopfx.cpp @@ -3,7 +3,7 @@ // _Stopfx function -#include +#include #include "xmath.hpp" diff --git a/stl/src/xstoul.cpp b/stl/src/xstoul.cpp index c9a3214ed5b..48f48489b22 100644 --- a/stl/src/xstoul.cpp +++ b/stl/src/xstoul.cpp @@ -3,14 +3,13 @@ // _Stoul function -#include -#include -#include -#include -#include -#include - -#include "xmath.hpp" +#include +#include +#include +#include +#include +#include + _EXTERN_C_UNLESS_PURE diff --git a/stl/src/xstoull.cpp b/stl/src/xstoull.cpp index 2d04d149ee8..8a29d7ab260 100644 --- a/stl/src/xstoull.cpp +++ b/stl/src/xstoull.cpp @@ -3,14 +3,12 @@ // _Stoull function -#include -#include -#include -#include -#include -#include - -#include "xmath.hpp" +#include +#include +#include +#include +#include +#include _EXTERN_C_UNLESS_PURE diff --git a/stl/src/xstoxflt.cpp b/stl/src/xstoxflt.cpp index a4e33a6a6e7..d8b2c590574 100644 --- a/stl/src/xstoxflt.cpp +++ b/stl/src/xstoxflt.cpp @@ -3,10 +3,10 @@ // _Stoxflt function -#include -#include -#include -#include +#include +#include +#include +#include #include "xmath.hpp" diff --git a/stl/src/xstrcoll.cpp b/stl/src/xstrcoll.cpp index 2def872bf86..752999db66e 100644 --- a/stl/src/xstrcoll.cpp +++ b/stl/src/xstrcoll.cpp @@ -3,12 +3,12 @@ // Compare two strings using the locale LC_COLLATE information. +#include +#include #include -#include -#include +#include +#include #include -#include -#include #include // for _Collvec, _Strcoll #include "awint.hpp" diff --git a/stl/src/xstrxfrm.cpp b/stl/src/xstrxfrm.cpp index e7988a747ab..e814ecfe618 100644 --- a/stl/src/xstrxfrm.cpp +++ b/stl/src/xstrxfrm.cpp @@ -3,11 +3,10 @@ // Transform a string using the locale information as set by LC_COLLATE. -#include -#include +#include +#include +#include #include -#include -#include #include // for _Collvec #include diff --git a/stl/src/xtime.cpp b/stl/src/xtime.cpp index 0de318718d8..6d4bb94dc6c 100644 --- a/stl/src/xtime.cpp +++ b/stl/src/xtime.cpp @@ -4,8 +4,6 @@ // xtime functions #include -#include -#include #include #include "awint.hpp" diff --git a/stl/src/xtowlower.cpp b/stl/src/xtowlower.cpp index 630f148bc69..b7417de4a96 100644 --- a/stl/src/xtowlower.cpp +++ b/stl/src/xtowlower.cpp @@ -3,7 +3,7 @@ // _Towlower -- convert wchar_t to lower case -#include +#include #include #include "awint.hpp" diff --git a/stl/src/xtowupper.cpp b/stl/src/xtowupper.cpp index 84901eae6ef..943b160ffcb 100644 --- a/stl/src/xtowupper.cpp +++ b/stl/src/xtowupper.cpp @@ -3,7 +3,7 @@ // _Towupper -- convert wchar_t to upper case -#include +#include #include #include "awint.hpp" diff --git a/stl/src/xwcscoll.cpp b/stl/src/xwcscoll.cpp index 9bf62598030..c63b673cf51 100644 --- a/stl/src/xwcscoll.cpp +++ b/stl/src/xwcscoll.cpp @@ -3,10 +3,9 @@ // Compare two wchar_t strings using the locale LC_COLLATE information. -#include -#include -#include -#include +#include +#include +#include #include // for _Collvec, _Wcscoll #include "awint.hpp" diff --git a/stl/src/xwcsxfrm.cpp b/stl/src/xwcsxfrm.cpp index ab3692be410..9c283e289b7 100644 --- a/stl/src/xwcsxfrm.cpp +++ b/stl/src/xwcsxfrm.cpp @@ -3,11 +3,11 @@ // Transform a wide-character string using the locale information as set by LC_COLLATE. +#include +#include +#include +#include #include -#include -#include -#include -#include #include // for _Collvec, _Wcsxfrm #include "awint.hpp" diff --git a/stl/src/xwctomb.cpp b/stl/src/xwctomb.cpp index d82f8a5bdaa..80ce47e3abe 100644 --- a/stl/src/xwctomb.cpp +++ b/stl/src/xwctomb.cpp @@ -3,13 +3,11 @@ // Convert wide character to multibyte character, with locale. -#include -#include // for MB_LEN_MAX -#include +#include +#include // for MB_LEN_MAX +#include +#include #include -#include // for EOF -#include -#include // for memcpy #include // for _Cvtvec, _Wcrtomb #include diff --git a/stl/src/xwstod.cpp b/stl/src/xwstod.cpp index 499d19e2852..a2a4c927158 100644 --- a/stl/src/xwstod.cpp +++ b/stl/src/xwstod.cpp @@ -3,8 +3,8 @@ // _WStod function -#include -#include +#include +#include #include "xmath.hpp" #include "xxdftype.hpp" diff --git a/stl/src/xwstof.cpp b/stl/src/xwstof.cpp index cbe81b4f3f0..8419e7f4974 100644 --- a/stl/src/xwstof.cpp +++ b/stl/src/xwstof.cpp @@ -3,7 +3,7 @@ // _WStof function -#include +#include #include "xmath.hpp" #include "xxfftype.hpp" diff --git a/stl/src/xwstoflt.cpp b/stl/src/xwstoflt.cpp index 0631679e5d2..0da23a067de 100644 --- a/stl/src/xwstoflt.cpp +++ b/stl/src/xwstoflt.cpp @@ -3,9 +3,9 @@ // _WStoflt function -#include -#include -#include +#include +#include +#include #include "xmath.hpp" diff --git a/stl/src/xwstold.cpp b/stl/src/xwstold.cpp index e00bb8194aa..ff8bbe800fa 100644 --- a/stl/src/xwstold.cpp +++ b/stl/src/xwstold.cpp @@ -3,7 +3,7 @@ // _WStold function -#include +#include #include "xmath.hpp" #include "xxlftype.hpp" diff --git a/stl/src/xwstopfx.cpp b/stl/src/xwstopfx.cpp index b3d74711b4d..a9447bca098 100644 --- a/stl/src/xwstopfx.cpp +++ b/stl/src/xwstopfx.cpp @@ -3,7 +3,7 @@ // _WStopfx function -#include +#include #include "xmath.hpp" diff --git a/stl/src/xwstoxfl.cpp b/stl/src/xwstoxfl.cpp index 871501031e3..174ab1cf351 100644 --- a/stl/src/xwstoxfl.cpp +++ b/stl/src/xwstoxfl.cpp @@ -3,10 +3,10 @@ // _WStoxflt function -#include -#include -#include -#include +#include +#include +#include +#include #include "xmath.hpp" diff --git a/stl/src/xxdftype.hpp b/stl/src/xxdftype.hpp index ecf8baff491..db33883c974 100644 --- a/stl/src/xxdftype.hpp +++ b/stl/src/xxdftype.hpp @@ -5,7 +5,7 @@ #include -#include +#include #define FTYPE double #define FBITS DBL_MANT_DIG diff --git a/stl/src/xxfftype.hpp b/stl/src/xxfftype.hpp index 387570dbb66..cd2e1ad4d80 100644 --- a/stl/src/xxfftype.hpp +++ b/stl/src/xxfftype.hpp @@ -5,7 +5,7 @@ #include -#include +#include #define FTYPE float #define FBITS FLT_MANT_DIG diff --git a/stl/src/xxlftype.hpp b/stl/src/xxlftype.hpp index 09b46c0c42c..8657da52ed6 100644 --- a/stl/src/xxlftype.hpp +++ b/stl/src/xxlftype.hpp @@ -5,7 +5,7 @@ #include -#include +#include #define FTYPE long double #define FBITS LDBL_MANT_DIG diff --git a/stl/src/xxxprec.hpp b/stl/src/xxxprec.hpp index 7f63882fa38..7eea90d532a 100644 --- a/stl/src/xxxprec.hpp +++ b/stl/src/xxxprec.hpp @@ -3,7 +3,7 @@ // common extended precision functionality -#include +#include #include "xmath.hpp" From 21505b65e41eaaa7bb635dd7e77ae31878dfc899 Mon Sep 17 00:00:00 2001 From: David Larson Date: Fri, 4 Sep 2020 22:16:46 -0700 Subject: [PATCH 2/7] Restore deleted headers in instances.cpp --- stl/src/instances.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/stl/src/instances.cpp b/stl/src/instances.cpp index e85f9e90ec0..96a8dedc47b 100644 --- a/stl/src/instances.cpp +++ b/stl/src/instances.cpp @@ -5,7 +5,15 @@ #define __FORCE_INSTANCE +#include +#include +#include +#include +#include #include +#include +#include +#include #include _STD_BEGIN From 38cf94b07a30054b351d898a2fe92ad552870fc3 Mon Sep 17 00:00:00 2001 From: SunnyWar Date: Wed, 23 Sep 2020 02:27:53 -0700 Subject: [PATCH 3/7] cstring for memcmp, put boost headers back --- stl/src/filesys.cpp | 1 + stl/src/special_math.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/stl/src/filesys.cpp b/stl/src/filesys.cpp index 8b1f308ba23..3fbca42219f 100644 --- a/stl/src/filesys.cpp +++ b/stl/src/filesys.cpp @@ -8,6 +8,7 @@ #include +#include #include #include #include diff --git a/stl/src/special_math.cpp b/stl/src/special_math.cpp index c53f9a76b9a..e824c10b2e1 100644 --- a/stl/src/special_math.cpp +++ b/stl/src/special_math.cpp @@ -23,12 +23,16 @@ #include #include #include +#include #include #include #include #include +#include #include +#include #include +#include #pragma warning(pop) From f76dcc7ffcc5693b2cd8700358fa19cf5edcc1a0 Mon Sep 17 00:00:00 2001 From: SunnyWar Date: Wed, 23 Sep 2020 02:53:48 -0700 Subject: [PATCH 4/7] addressing review comments --- stl/src/StlCompareStringW.cpp | 2 ++ stl/src/StlLCMapStringW.cpp | 2 ++ stl/src/primitives.hpp | 1 + stl/src/taskscheduler.cpp | 1 + stl/src/thread0.cpp | 2 -- stl/src/winapinls.cpp | 1 + stl/src/winapisupp.cpp | 2 ++ stl/src/xmath.hpp | 1 + stl/src/xwcscoll.cpp | 1 + 9 files changed, 11 insertions(+), 2 deletions(-) diff --git a/stl/src/StlCompareStringW.cpp b/stl/src/StlCompareStringW.cpp index 6af12562bd3..890dd18e8a2 100644 --- a/stl/src/StlCompareStringW.cpp +++ b/stl/src/StlCompareStringW.cpp @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +#include // for wcsnlen + #include #include "awint.hpp" diff --git a/stl/src/StlLCMapStringW.cpp b/stl/src/StlLCMapStringW.cpp index bc3bc35ad7a..e6e4d17b97a 100644 --- a/stl/src/StlLCMapStringW.cpp +++ b/stl/src/StlLCMapStringW.cpp @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +#include // for wcsnlen + #include "awint.hpp" // int __cdecl __crtLCMapStringW - Get type information about a wide string. diff --git a/stl/src/primitives.hpp b/stl/src/primitives.hpp index 799b1c8d4bf..6761eb01119 100644 --- a/stl/src/primitives.hpp +++ b/stl/src/primitives.hpp @@ -7,6 +7,7 @@ #pragma warning(disable : 4324) // structure was padded due to alignment specifier #include +#include // for __max #include #include diff --git a/stl/src/taskscheduler.cpp b/stl/src/taskscheduler.cpp index 9c0a698ea36..1da7e7a4d62 100644 --- a/stl/src/taskscheduler.cpp +++ b/stl/src/taskscheduler.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception #include +#include // for size_t #include #include diff --git a/stl/src/thread0.cpp b/stl/src/thread0.cpp index e385909a311..bffe7faf63b 100644 --- a/stl/src/thread0.cpp +++ b/stl/src/thread0.cpp @@ -3,8 +3,6 @@ // thread support functions -#include - #include #include #include diff --git a/stl/src/winapinls.cpp b/stl/src/winapinls.cpp index 7ff49097a25..6c38de139c4 100644 --- a/stl/src/winapinls.cpp +++ b/stl/src/winapinls.cpp @@ -7,6 +7,7 @@ #include #include +#include // for _countof #include namespace { diff --git a/stl/src/winapisupp.cpp b/stl/src/winapisupp.cpp index aa6e3bce7c3..fd32f6413ad 100644 --- a/stl/src/winapisupp.cpp +++ b/stl/src/winapisupp.cpp @@ -4,6 +4,7 @@ // clang-format off // Prevent clang-format from reordering before #include +#include // for APPMODEL_ERROR_NO_PACKAGE #include "awint.hpp" #include #include @@ -13,6 +14,7 @@ #pragma warning(disable : 4265) // non-virtual destructor in base class #include #pragma warning(pop) +#include // for _InterlockedCompareExchangePointer #include #if !defined(_CRT_WINDOWS) && !defined(UNDOCKED_WINDOWS_UCRT) diff --git a/stl/src/xmath.hpp b/stl/src/xmath.hpp index 9d89959283e..a2ebd22d505 100644 --- a/stl/src/xmath.hpp +++ b/stl/src/xmath.hpp @@ -3,6 +3,7 @@ #ifndef _XMATH #define _XMATH +#include #include #include diff --git a/stl/src/xwcscoll.cpp b/stl/src/xwcscoll.cpp index c63b673cf51..c8a105d94cf 100644 --- a/stl/src/xwcscoll.cpp +++ b/stl/src/xwcscoll.cpp @@ -6,6 +6,7 @@ #include #include #include +#include // for wmemcmp #include // for _Collvec, _Wcscoll #include "awint.hpp" From 6e3ad6741c0bccda4208e84c893376aeb69c1542 Mon Sep 17 00:00:00 2001 From: SunnyWar Date: Wed, 23 Sep 2020 03:02:55 -0700 Subject: [PATCH 5/7] restored to for __strncnt --- stl/src/StlCompareStringA.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/stl/src/StlCompareStringA.cpp b/stl/src/StlCompareStringA.cpp index 7b634390747..4a07a0a9e1f 100644 --- a/stl/src/StlCompareStringA.cpp +++ b/stl/src/StlCompareStringA.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception #include +#include // for __strncnt #include #include From d363ed02ffe30f8531a95b3e7956168a64395a02 Mon Sep 17 00:00:00 2001 From: SunnyWar Date: Wed, 23 Sep 2020 03:11:20 -0700 Subject: [PATCH 6/7] includes for abort and memcpy --- stl/src/excptptr.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stl/src/excptptr.cpp b/stl/src/excptptr.cpp index 7c996a76265..ed5460df8cd 100644 --- a/stl/src/excptptr.cpp +++ b/stl/src/excptptr.cpp @@ -11,6 +11,8 @@ #endif // _VCRT_ALLOW_INTERNALS #include +#include // for abort +#include // for memcpy #include #include #include From 113655a19baca4496d6eedf9682b690db77c569d Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Wed, 23 Sep 2020 17:17:41 -0700 Subject: [PATCH 7/7] Adjust spaces. --- stl/src/winapisupp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stl/src/winapisupp.cpp b/stl/src/winapisupp.cpp index fd32f6413ad..337062d791b 100644 --- a/stl/src/winapisupp.cpp +++ b/stl/src/winapisupp.cpp @@ -4,7 +4,7 @@ // clang-format off // Prevent clang-format from reordering before #include -#include // for APPMODEL_ERROR_NO_PACKAGE +#include // for APPMODEL_ERROR_NO_PACKAGE #include "awint.hpp" #include #include