[libc++][C++03] Cherry pick #164272

[c8ef]

No description provided.

[llvmbot]

@llvm/pr-subscribers-libcxx

Author: Connector Switch (c8ef)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/164447.diff

1 Files Affected:

• (modified) libcxx/include/__cxx03/__algorithm/for_each.h (-6)

diff --git a/libcxx/include/__cxx03/__algorithm/for_each.h b/libcxx/include/__cxx03/__algorithm/for_each.h
index d160a9eddc50b..1ffb0137c0af7 100644
--- a/libcxx/include/__cxx03/__algorithm/for_each.h
+++ b/libcxx/include/__cxx03/__algorithm/for_each.h
@@ -14,15 +14,11 @@
 #include <__cxx03/__config>
 #include <__cxx03/__iterator/segmented_iterator.h>
 #include <__cxx03/__type_traits/enable_if.h>
-#include <__cxx03/__utility/move.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 
-_LIBCPP_PUSH_MACROS
-#include <__cxx03/__undef_macros>
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _InputIterator, class _Function>
@@ -34,6 +30,4 @@ _LIBCPP_HIDE_FROM_ABI _Function for_each(_InputIterator __first, _InputIterator
 
 _LIBCPP_END_NAMESPACE_STD
 
-_LIBCPP_POP_MACROS
-
 #endif // _LIBCPP___CXX03___ALGORITHM_FOR_EACH_H

[philnik777]

This shouldn't have been landed. We should fix the C++03 headers, not back-port NFC changes.

[c8ef]

This shouldn't have been landed.

Sorry, I will wait for second approval on this next time.

We should fix the C++03 headers, not back-port NFC changes.

I'm not sure I follow. Do you mean we should only backport functional changes?

[philnik777]

This shouldn't have been landed.

Sorry, I will wait for second approval on this next time.

No worries, it's not super clear what's up with the C++03 headers for most people.

We should fix the C++03 headers, not back-port NFC changes.

I'm not sure I follow. Do you mean we should only backport functional changes?

Yes. they're currently not quite working, so we should first fix them, and if we deem it worth it we can clean them up afterwards.