Skip to content

Commit 2d39b70

Browse files
committed
Clean up some StringPiece-related cruft.
Change-Id: I6bf7ccda2b0a80b782f3fb3fe05ba79f77082e22 Reviewed-on: https://code-review.googlesource.com/c/re2/+/61490 Reviewed-by: Alex Chernyakhovsky <[email protected]> Reviewed-by: Paul Wankadia <[email protected]>
1 parent c53443c commit 2d39b70

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

libre2.symbols

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
# re2::RE2*
44
_ZN3re23RE2*;
55
_ZNK3re23RE2*;
6-
# re2::StringPiece*
7-
_ZN3re211StringPiece*;
8-
_ZNK3re211StringPiece*;
96
# re2::operator<<*
107
_ZN3re2ls*;
118
# re2::FilteredRE2*

libre2.symbols.darwin

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
# re2::RE2*
33
__ZN3re23RE2*
44
__ZNK3re23RE2*
5-
# re2::StringPiece*
6-
__ZN3re211StringPiece*
7-
__ZNK3re211StringPiece*
85
# re2::operator<<*
96
__ZN3re2ls*
107
# re2::FilteredRE2*

re2/stringpiece.h

+2-8
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@
99

1010
namespace re2 {
1111

12-
// RE2 has two versions: "sans Abseil" in the main branch; and "avec Abseil" in
13-
// the abseil branch. This has led to a diamond dependency problem for projects
14-
// like Envoy: as per https://github.com/google/re2/issues/388, GoogleTest took
15-
// a dependency on RE2 avec Abseil, but other things depend on RE2 sans Abseil.
16-
// To resolve this conflict until both versions can migrate to std::string_view
17-
// (C++17), those other things must be able to #include "re2/stringpiece.h" and
18-
// use re2::StringPiece. (This is a hack, obviously, but it beats telling every
19-
// project in this situation that they have to perform source transformations.)
12+
// Until RE2 requires C++17 and uses std::string_view, allow users to
13+
// continue to #include "re2/stringpiece.h" and use re2::StringPiece.
2014
using StringPiece = absl::string_view;
2115

2216
} // namespace re2

0 commit comments

Comments
 (0)