-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[abseil] Update to the latest and fix link failure error using StrCat (…
…#9367) * [abseil] Update to the latest and fix link failure for StrCat with > 4 arguments * Remove message from vcpkg_fail_port_install * Update lnk2019-error patch
- Loading branch information
1 parent
2ee03ba
commit 6723668
Showing
5 changed files
with
51 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
diff --git a/absl/base/options.h b/absl/base/options.h | ||
index 3961e63..d4f21ec 100644 | ||
--- a/absl/base/options.h | ||
+++ b/absl/base/options.h | ||
@@ -94,7 +94,7 @@ | ||
// User code should not inspect this macro. To check in the preprocessor if | ||
// absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. | ||
|
||
-#define ABSL_OPTION_USE_STD_ANY 2 | ||
+#define ABSL_OPTION_USE_STD_ANY 0 | ||
|
||
|
||
// ABSL_OPTION_USE_STD_OPTIONAL | ||
@@ -129,7 +129,7 @@ | ||
// absl::optional is a typedef of std::optional, use the feature macro | ||
// ABSL_USES_STD_OPTIONAL. | ||
|
||
-#define ABSL_OPTION_USE_STD_OPTIONAL 2 | ||
+#define ABSL_OPTION_USE_STD_OPTIONAL 0 | ||
|
||
|
||
// ABSL_OPTION_USE_STD_STRING_VIEW | ||
@@ -156,7 +156,7 @@ | ||
// absl::string_view is a typedef of std::string_view, use the feature macro | ||
// ABSL_USES_STD_STRING_VIEW. | ||
|
||
-#define ABSL_OPTION_USE_STD_STRING_VIEW 2 | ||
+#define ABSL_OPTION_USE_STD_STRING_VIEW 0 | ||
|
||
|
||
// ABSL_OPTION_USE_STD_VARIANT | ||
@@ -183,6 +183,6 @@ | ||
// absl::variant is a typedef of std::variant, use the feature macro | ||
// ABSL_USES_STD_VARIANT. | ||
|
||
-#define ABSL_OPTION_USE_STD_VARIANT 2 | ||
+#define ABSL_OPTION_USE_STD_VARIANT 0 | ||
|
||
#endif // ABSL_BASE_OPTIONS_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters