[llvm-branch-commits] [libcxx] release/19.x: Guard an include of `<ostream>` in `<chrono>` with availability macro (#108429) (PR #108515)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Fri Sep 13 01:32:25 PDT 2024


https://github.com/llvmbot created https://github.com/llvm/llvm-project/pull/108515

Backport 127c34948bd54e92ef2ee544e8bc42acecf321ad

Requested by: @var-const

>From b240a4e402e2db9e096a8bb114616bad4f5a2ab3 Mon Sep 17 00:00:00 2001
From: Konstantin Varlamov <varconsteq at gmail.com>
Date: Fri, 13 Sep 2024 01:26:57 -0700
Subject: [PATCH] Guard an include of `<ostream>` in `<chrono>` with
 availability macro (#108429)

This fixes a regression introduced in
https://github.com/llvm/llvm-project/pull/96035.

(cherry picked from commit 127c34948bd54e92ef2ee544e8bc42acecf321ad)
---
 libcxx/include/chrono | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcxx/include/chrono b/libcxx/include/chrono
index 990c415ec2e972..7bec5e5a26ef4a 100644
--- a/libcxx/include/chrono
+++ b/libcxx/include/chrono
@@ -1015,8 +1015,8 @@ constexpr chrono::year                                  operator ""y(unsigned lo
 #  include <charconv>
 #  if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
 #    include <locale>
+#    include <ostream>
 #  endif
-#  include <ostream>
 #endif
 
 #endif // _LIBCPP_CHRONO



More information about the llvm-branch-commits mailing list