diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-03-05 16:01:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 16:01:57 -0800 |
| commit | f9e78dcc68d70911868d3bb40a35409ad0b89cf3 (patch) | |
| tree | 13c72012094bfff3bc5767b4d89736f59bebf579 /ports/abseil/fix-lnk2019-error.patch | |
| parent | 3e90c7dad9594680c10116fd684c1b31575fbdee (diff) | |
| download | vcpkg-f9e78dcc68d70911868d3bb40a35409ad0b89cf3.tar.gz vcpkg-f9e78dcc68d70911868d3bb40a35409ad0b89cf3.zip | |
[abseil] Add uwp support (#10301)
* [abseil] Add uwp support
* [abseil] Drop support with arm/arm64
* [opencensus-cpp] Add keyword supports
* update baseline
* [abseil] Enable arm support
Diffstat (limited to 'ports/abseil/fix-lnk2019-error.patch')
| -rw-r--r-- | ports/abseil/fix-lnk2019-error.patch | 79 |
1 files changed, 40 insertions, 39 deletions
diff --git a/ports/abseil/fix-lnk2019-error.patch b/ports/abseil/fix-lnk2019-error.patch index f16f1f68b..645d1e094 100644 --- a/ports/abseil/fix-lnk2019-error.patch +++ b/ports/abseil/fix-lnk2019-error.patch @@ -1,39 +1,40 @@ -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_
+diff --git a/absl/base/options.h b/absl/base/options.h +index 234137c..1fb77e4 100644 +--- a/absl/base/options.h ++++ b/absl/base/options.h +@@ -100,7 +100,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 +@@ -127,7 +127,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 +@@ -154,7 +154,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 + // +@@ -180,7 +180,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_INLINE_NAMESPACE |