Skip to content

Commit

Permalink
Include complete patch
Browse files Browse the repository at this point in the history
  • Loading branch information
aandvalenzuela committed Feb 16, 2023
1 parent 0915e65 commit 3722765
Showing 1 changed file with 32 additions and 1 deletion.
33 changes: 32 additions & 1 deletion root-12276.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f945434a97c345a7a26ba5cc55db836441c53ed1 Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <[email protected]>
Date: Thu, 9 Feb 2023 17:47:16 +0000
Subject: [PATCH] [cxxmodules] Add a module for experimental/string_view
Subject: [PATCH 1/2] [cxxmodules] Add a module for experimental/string_view

Recent gcc updates somehow make experimental/string_view available through
module string_view. Then it wrongly decides it needs to include
Expand Down Expand Up @@ -32,3 +32,34 @@ index 6af475ae6b47..e4d0e33eea2a 100644
module "ext/functional" {
export *
header "ext/functional"

From 4540af29cc92b31b18219c4a9fbd6d10d289d99f Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <[email protected]>
Date: Thu, 16 Feb 2023 07:04:17 +0000
Subject: [PATCH 2/2] bits/ranges_base.h and uses_allocator_args.h are
available in c++14 as well.

---
interpreter/cling/include/cling/std.modulemap | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interpreter/cling/include/cling/std.modulemap b/interpreter/cling/include/cling/std.modulemap
index e4d0e33eea2a..fff944ba7fbc 100644
--- a/interpreter/cling/include/cling/std.modulemap
+++ b/interpreter/cling/include/cling/std.modulemap
@@ -489,13 +489,13 @@ module "std" [system] {
header "bits/ranges_algobase.h"
}
module "bits/ranges_base.h" {
- requires cplusplus20
+ requires cplusplus14
export *
export bits_stl_iterator_h
header "bits/ranges_base.h"
}
module "bits/uses_allocator_args.h" {
- requires cplusplus20
+ requires cplusplus14
export *
header "bits/uses_allocator_args.h"
}

0 comments on commit 3722765

Please sign in to comment.