Split <chrono> into <__msvc_chrono.hpp> (#2604)

Co-authored-by: cpplearner <[email protected]>
microsoft · Mar 19, 2022 · fdcafc0 · fdcafc0
1 parent f310638
commit fdcafc0
Show file tree

Hide file tree

Showing 11 changed files with 799 additions and 765 deletions.
diff --git a/stl/CMakeLists.txt b/stl/CMakeLists.txt
@@ -3,6 +3,7 @@
 
 set(HEADERS
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_all_public_headers.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_chrono.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_int128.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_system_error_abi.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_tzdb.hpp

diff --git a/stl/inc/__msvc_chrono.hpp b/stl/inc/__msvc_chrono.hpp
diff --git a/stl/inc/chrono b/stl/inc/chrono
diff --git a/stl/inc/condition_variable b/stl/inc/condition_variable
@@ -8,7 +8,7 @@
 #define _CONDITION_VARIABLE_
 #include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
-#include <chrono>
+#include <__msvc_chrono.hpp>
 #include <memory>
 #include <mutex>
 #include <xthreads.h>

diff --git a/stl/inc/experimental/filesystem b/stl/inc/experimental/filesystem
@@ -9,8 +9,8 @@
 #include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
+#include <__msvc_chrono.hpp> // for chrono::time_point
 #include <algorithm> // for replace
-#include <chrono> // for chrono::time_point
 #include <codecvt> // for codecvt_utf8_*
 #include <list> // for recursive_directory_iterator stack
 #include <locale> // for wstring_convert

diff --git a/stl/inc/future b/stl/inc/future
@@ -17,7 +17,7 @@
 #include <experimental/resumable>
 #endif // _RESUMABLE_FUNCTIONS_SUPPORTED
 
-#include <chrono>
+#include <__msvc_chrono.hpp>
 #include <condition_variable>
 #include <functional>
 #include <memory>

diff --git a/stl/inc/header-units.json b/stl/inc/header-units.json
@@ -5,6 +5,7 @@
     "Version": "1.0",
     "BuildAsHeaderUnits": [
         // "__msvc_all_public_headers.hpp", // for testing, not production
+        "__msvc_chrono.hpp",
         "__msvc_int128.hpp",
         "__msvc_system_error_abi.hpp",
         "__msvc_tzdb.hpp",

diff --git a/stl/inc/mutex b/stl/inc/mutex
@@ -13,7 +13,7 @@
 #error <mutex> is not supported when compiling with /clr:pure.
 #endif // _M_CEE_PURE
 
-#include <chrono>
+#include <__msvc_chrono.hpp>
 #include <cstdlib>
 #include <system_error>
 #include <thread>

diff --git a/stl/inc/semaphore b/stl/inc/semaphore
@@ -17,8 +17,8 @@
 #pragma message("The contents of <semaphore> are available only with C++20 or later.")
 #else // ^^^ !_HAS_CXX20 / _HAS_CXX20 vvv
 
+#include <__msvc_chrono.hpp>
 #include <atomic>
-#include <chrono>
 #include <climits>
 
 #pragma pack(push, _CRT_PACKING)

diff --git a/stl/inc/thread b/stl/inc/thread
@@ -8,7 +8,7 @@
 #define _THREAD_
 #include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
-#include <chrono>
+#include <__msvc_chrono.hpp>
 #include <memory>
 #include <process.h>
 #include <tuple>

diff --git a/tests/std/tests/P0660R10_jthread_and_cv_any/test.cpp b/tests/std/tests/P0660R10_jthread_and_cv_any/test.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <assert.h>
+#include <chrono>
 #include <condition_variable>
 #include <mutex>
 #include <stdio.h>