Index: third_party/protobuf/README.chromium |
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium |
index b6ccf575c69534371db652c8f4d95ce2a3df43db..92391f6be3025def28bbda7e05139cfe5c30794b 100644 |
--- a/third_party/protobuf/README.chromium |
+++ b/third_party/protobuf/README.chromium |
@@ -33,3 +33,5 @@ Revision 523 was cherry-picked from upstream. |
Revision 524 was cherry-picked from upstream. |
Revision 573 was cherry-picked from upstream. |
The `&file->options() != NULL &&` was removed from descriptor.cc |
+References to `vector` were changed to `std::vector` in extension_set.h |
+and unknown_field_set.h |
Nico
2014/10/31 14:30:08
Did you change this upstream?
Fabrice (no longer in Chrome)
2014/10/31 15:45:24
I'm working on that part, just not sure if that sh
Nico
2014/10/31 16:10:03
I don't know either. agl@, pliard@, rmcilory@ have
|