Post csharp landing fixup.

Re-add the objc prefix that got removed by accident. Regenerate the generated descriptors (C++ and ObjC).
goldenbull · May 18, 2015 · ffa2e37 · ffa2e37
1 parent 17ca0fe
commit ffa2e37
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 13 deletions.
diff --git a/objectivec/google/protobuf/Descriptor.pbobjc.h b/objectivec/google/protobuf/Descriptor.pbobjc.h
diff --git a/objectivec/google/protobuf/Descriptor.pbobjc.m b/objectivec/google/protobuf/Descriptor.pbobjc.m
diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc
diff --git a/src/google/protobuf/duration.proto b/src/google/protobuf/duration.proto
@@ -36,6 +36,7 @@ option java_multiple_files = true;
 option java_outer_classname = "DurationProto";
 option java_package = "com.google.protobuf";
 option csharp_namespace = "Google.ProtocolBuffers";
+option objc_class_prefix = "GPB";
 
 // A Duration represents a signed, fixed-length span of time represented
 // as a count of seconds and fractions of seconds at nanosecond

diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc