cfefe417a0
* abseil-cpp 20250512.0 * protobuf v31.0 * re2 2024-07-02 * googletest 1.17.0 * benchmark 1.9.2 devNote: to fix a patch not working ```sh cd ~/.../ortools_repo cmake -S. -Bbuild -DBUILD_DEPS=ON -DBUILD_EXAMPLES=OFF -DBUILD_SAMPLES=OFF -DBUILD_TESTING=ON pushd build/_deps/absl-src git apply --3way ~/.../ortools_repo/patches/abseil-cpp-20250512.0.patch git mergetool git diff HEAD -u > ~/.../ortools_repo/patches/abseil-cpp-20250512.0.patch cd .. rm -rf absl-* popd <repeat> ```
21 lines
795 B
Diff
21 lines
795 B
Diff
diff --git a/absl/flags/declare.h b/absl/flags/declare.h
|
|
index 8d2a856..a154046 100644
|
|
--- a/absl/flags/declare.h
|
|
+++ b/absl/flags/declare.h
|
|
@@ -59,10 +59,15 @@ ABSL_NAMESPACE_END
|
|
|
|
// Internal implementation of ABSL_DECLARE_FLAG to allow macro expansion of its
|
|
// arguments. Clients must use ABSL_DECLARE_FLAG instead.
|
|
+#if defined(_MSC_VER)
|
|
+#define ABSL_DECLARE_FLAG_INTERNAL(type, name) \
|
|
+ extern absl::Flag<type> FLAGS_##name
|
|
+#else
|
|
#define ABSL_DECLARE_FLAG_INTERNAL(type, name) \
|
|
extern absl::Flag<type> FLAGS_##name; \
|
|
namespace absl /* block flags in namespaces */ {} \
|
|
/* second redeclaration is to allow applying attributes */ \
|
|
extern absl::Flag<type> FLAGS_##name
|
|
+#endif // _MSC_VER
|
|
|
|
#endif // ABSL_FLAGS_DECLARE_H_
|