aboutsummaryrefslogtreecommitdiff
path: root/src/google
diff options
context:
space:
mode:
authorPaul Yang <TeBoring@users.noreply.github.com>2015-08-26 16:25:56 -0700
committerPaul Yang <TeBoring@users.noreply.github.com>2015-08-26 16:25:56 -0700
commit106f3eb985670761ce51bc7a08416ce6083c6bbd (patch)
treea6fe0dfeff236bbb90b551a456de7899c6d2b001 /src/google
parente94e062b589cfc1c5d486ec4470af104e102232b (diff)
parentaca5a60883385db08f234e43d1f1b2f5867f92e5 (diff)
downloadprotobuf-106f3eb985670761ce51bc7a08416ce6083c6bbd.tar.gz
protobuf-106f3eb985670761ce51bc7a08416ce6083c6bbd.tar.bz2
protobuf-106f3eb985670761ce51bc7a08416ce6083c6bbd.zip
Merge pull request #750 from TeBoring/beta-1
Fix bugs for objectivec
Diffstat (limited to 'src/google')
-rw-r--r--src/google/protobuf/unittest_no_arena.proto1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/unittest_no_arena.proto b/src/google/protobuf/unittest_no_arena.proto
index 36fb8656..41518df2 100644
--- a/src/google/protobuf/unittest_no_arena.proto
+++ b/src/google/protobuf/unittest_no_arena.proto
@@ -44,6 +44,7 @@ option cc_generic_services = true; // auto-added
option java_generic_services = true; // auto-added
option py_generic_services = true; // auto-added
option cc_enable_arenas = false;
+option objc_class_prefix = "NOARN";
import "google/protobuf/unittest_import.proto";
import "google/protobuf/unittest_arena.proto";