46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
Make the headers always tell the truth about the ABI of the compiled dll's
|
|
to avoid mysterious linker errors when using wrong C++ version in compiler.
|
|
This version of patch is for new systems (Tumbleweed) where Abseil is built with C++17 support.
|
|
For more information, see “notice for package managers” in options.h
|
|
|
|
Index: abseil-cpp-20230125.2/absl/base/options.h
|
|
===================================================================
|
|
--- abseil-cpp-20230125.2.orig/absl/base/options.h
|
|
+++ abseil-cpp-20230125.2/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 1
|
|
|
|
|
|
// 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 1
|
|
|
|
|
|
// 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 1
|
|
|
|
// 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 1
|
|
|
|
|
|
// ABSL_OPTION_USE_INLINE_NAMESPACE
|