[libcxx-commits] [libcxx] 43aaf87 - [libc++] Include <__config> first in all standard headers.

Arthur O'Dwyer via libcxx-commits libcxx-commits at lists.llvm.org
Mon Mar 22 16:01:52 PDT 2021


Author: Arthur O'Dwyer
Date: 2021-03-22T19:01:18-04:00
New Revision: 43aaf87173aceda1144c12cd9644fbe3844787aa

URL: https://github.com/llvm/llvm-project/commit/43aaf87173aceda1144c12cd9644fbe3844787aa
DIFF: https://github.com/llvm/llvm-project/commit/43aaf87173aceda1144c12cd9644fbe3844787aa.diff

LOG: [libc++] Include <__config> first in all standard headers.

Mostly, *don't* include <experimental/__config> from C++17 <any>,
because that doesn't make any sense. I think it was just a cut-and-paste
typo when this header moved from experimental/.

Differential Revision: https://reviews.llvm.org/D99089

Added: 
    

Modified: 
    libcxx/include/any
    libcxx/include/system_error

Removed: 
    


################################################################################
diff  --git a/libcxx/include/any b/libcxx/include/any
index 968c9769ee36..aaeaab6c8f74 100644
--- a/libcxx/include/any
+++ b/libcxx/include/any
@@ -80,7 +80,7 @@ namespace std {
 
 */
 
-#include <experimental/__config>
+#include <__config>
 #include <__availability>
 #include <memory>
 #include <typeinfo>

diff  --git a/libcxx/include/system_error b/libcxx/include/system_error
index b714e1d4263d..784adccbec02 100644
--- a/libcxx/include/system_error
+++ b/libcxx/include/system_error
@@ -142,11 +142,12 @@ template <> struct hash<std::error_condition>;
 
 */
 
+#include <__config>
 #include <__errc>
-#include <type_traits>
+#include <__functional_base> // unary_function
 #include <stdexcept>
-#include <__functional_base>
 #include <string>
+#include <type_traits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header


        


More information about the libcxx-commits mailing list