summaryrefslogtreecommitdiff
path: root/etc/patches/options.h.diff
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-04-11 16:55:07 +0200
committerPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-04-12 16:30:35 +0200
commite7458ab863ea9b1b2e6a9b874e5fdd1dd7262c22 (patch)
tree3503344aae36d950b7cc6bc5332dbeecbfa45e64 /etc/patches/options.h.diff
parent0c36fdfdb8705f6af33d7775c2afd006356cb17b (diff)
downloadjustbuild-e7458ab863ea9b1b2e6a9b874e5fdd1dd7262c22.tar.gz
Update grpc to v1.62.1 and all its dependencies
- update boringssl to commit ae72a45 - update protobuf to v25.1 - update abseil to v20240116.0 (including patches) Also add mirrors for third-party dependencies where known and hashes correspond.
Diffstat (limited to 'etc/patches/options.h.diff')
-rw-r--r--etc/patches/options.h.diff31
1 files changed, 20 insertions, 11 deletions
diff --git a/etc/patches/options.h.diff b/etc/patches/options.h.diff
index d0f27f99..622ed702 100644
--- a/etc/patches/options.h.diff
+++ b/etc/patches/options.h.diff
@@ -3,36 +3,45 @@
@@ -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
@@ -121,7 +121,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
@@ -148,7 +148,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
//
@@ -174,7 +174,7 @@
// 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
-
-
+
+ // ABSL_OPTION_USE_STD_ORDERING
+ //
+@@ -201,7 +201,7 @@
+ // the ordering types are aliases of std:: ordering types, use the feature macro
+ // ABSL_USES_STD_ORDERING.
+
+-#define ABSL_OPTION_USE_STD_ORDERING 2
++#define ABSL_OPTION_USE_STD_ORDERING 0
+
// ABSL_OPTION_USE_INLINE_NAMESPACE
+ // ABSL_OPTION_INLINE_NAMESPACE_NAME