File tree Expand file tree Collapse file tree 1 file changed +13
-7
lines changed Expand file tree Collapse file tree 1 file changed +13
-7
lines changed Original file line number Diff line number Diff line change 1
- diff -uw -r a/absl/base/options.h b/absl/base/options.h
2
- --- a/absl/base/options.h 2021-04-02 23:00:31.996584600 -0400
3
- +++ b/absl/base/options.h 2021-04-02 23:01:07.506208600 -0400
4
- @@ -154,7 +154,7 @@
1
+ diff --git a/absl/base/options.h b/absl/base/options.h
2
+ index 4b70446b..6a839d94 100644
3
+ --- a/absl/base/options.h
4
+ +++ b/absl/base/options.h
5
+ @@ -148,7 +148,13 @@
5
6
// absl::string_view is a typedef of std::string_view, use the feature macro
6
7
// ABSL_USES_STD_STRING_VIEW.
7
-
8
- - #define ABSL_OPTION_USE_STD_STRING_VIEW 2
8
+
9
+ + #ifdef _WIN32
10
+ + // On Windows, the std::string_view iterator is not const char*, which
11
+ + // is the expectation in a lot of Verible code. Use absl-impl.
9
12
+ #define ABSL_OPTION_USE_STD_STRING_VIEW 0
10
-
13
+ + #else
14
+ #define ABSL_OPTION_USE_STD_STRING_VIEW 2
15
+ + #endif
16
+
11
17
// ABSL_OPTION_USE_STD_VARIANT
12
18
//
You can’t perform that action at this time.
0 commit comments