Down-integrate from internal code base (C++ maps support).

1 files changed, 5 insertions, 0 deletions

diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index f30f4df5..0874c4e4 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -340,6 +340,11 @@ message FileOptions {
   optional bool deprecated = 23 [default=false];
 
 
+  // Enables the use of arenas for the proto messages in this file. This applies
+  // only to generated classes for C++.
+  optional bool cc_enable_arenas = 31 [default=false];
+
+
   // The parser stores options it doesn't recognize here. See above.
   repeated UninterpretedOption uninterpreted_option = 999;