Browse Source
This fixes build breakage with latest nightly libc++. Sincepull/134/head2e2f3158c6, fewer libc++ headers transitively include <algorithm>. This protobuf header uses std::fill unconditionally, which is a function provided by <algorithm>. (The surrounding code comment was wrong/outdated - <algorithm> was needed on all platforms.) The same seems to have been fixed in upstream protobuf as part of a larger code sync:ab4585a695 (diff-5cc9e8e347380b7bbc8fac8c06dc98100f3b5c076fcffa177e8ce11e753d4f7c)
committed by
Jean-Baptiste Kempf
2 changed files with 16 additions and 0 deletions
@ -0,0 +1,14 @@ |
|||
--- protobuf/src/google/protobuf/repeated_field.h.orig 2022-02-17 12:44:54.526527423 +0200
|
|||
+++ protobuf/src/google/protobuf/repeated_field.h 2022-02-17 12:44:58.190446363 +0200
|
|||
@@ -46,11 +46,7 @@
|
|||
#ifndef GOOGLE_PROTOBUF_REPEATED_FIELD_H__ |
|||
#define GOOGLE_PROTOBUF_REPEATED_FIELD_H__ |
|||
|
|||
-#ifdef _MSC_VER
|
|||
-// This is required for min/max on VS2013 only.
|
|||
#include <algorithm> |
|||
-#endif
|
|||
-
|
|||
#include <string> |
|||
#include <iterator> |
|||
#include <google/protobuf/stubs/casts.h> |
|||
Loading…
Reference in new issue