Skip to content

Commit aca5a60

Browse files
committed
Fix bugs for objectivec
1 parent b1b98e4 commit aca5a60

16 files changed

+457
-29
lines changed

objectivec/DevTools/compile_testing_protos.sh

+4
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ fi
6868
mkdir -p "${OUTPUT_DIR}/google/protobuf"
6969

7070
CORE_PROTO_FILES=( \
71+
src/google/protobuf/unittest_arena.proto \
7172
src/google/protobuf/unittest_custom_options.proto \
7273
src/google/protobuf/unittest_enormous_descriptor.proto \
7374
src/google/protobuf/unittest_embed_optimize_for.proto \
@@ -76,6 +77,9 @@ CORE_PROTO_FILES=( \
7677
src/google/protobuf/unittest_import_lite.proto \
7778
src/google/protobuf/unittest_lite.proto \
7879
src/google/protobuf/unittest_mset.proto \
80+
src/google/protobuf/unittest_mset_wire_format.proto \
81+
src/google/protobuf/unittest_no_arena.proto \
82+
src/google/protobuf/unittest_no_arena_import.proto \
7983
src/google/protobuf/unittest_no_generic_services.proto \
8084
src/google/protobuf/unittest_optimize_for.proto \
8185
src/google/protobuf/unittest.proto \

objectivec/Tests/GPBUnittestProtos.m

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#import "google/protobuf/MapProto2Unittest.pbobjc.m"
3535
#import "google/protobuf/MapUnittest.pbobjc.m"
3636
#import "google/protobuf/Unittest.pbobjc.m"
37+
#import "google/protobuf/UnittestArena.pbobjc.m"
3738
#import "google/protobuf/UnittestCustomOptions.pbobjc.m"
3839
#import "google/protobuf/UnittestCycle.pbobjc.m"
3940
#import "google/protobuf/UnittestDropUnknownFields.pbobjc.m"
@@ -46,6 +47,9 @@
4647
#import "google/protobuf/UnittestImportPublicLite.pbobjc.m"
4748
#import "google/protobuf/UnittestLite.pbobjc.m"
4849
#import "google/protobuf/UnittestMset.pbobjc.m"
50+
#import "google/protobuf/UnittestMsetWireFormat.pbobjc.m"
51+
#import "google/protobuf/UnittestNoArena.pbobjc.m"
52+
#import "google/protobuf/UnittestNoArenaImport.pbobjc.m"
4953
#import "google/protobuf/UnittestNoGenericServices.pbobjc.m"
5054
#import "google/protobuf/UnittestObjc.pbobjc.m"
5155
#import "google/protobuf/UnittestObjcStartup.pbobjc.m"

objectivec/Tests/GPBWireFormatTests.m

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#import "GPBUnknownField_PackagePrivate.h"
3636
#import "google/protobuf/Unittest.pbobjc.h"
3737
#import "google/protobuf/UnittestMset.pbobjc.h"
38+
#import "google/protobuf/UnittestMsetWireFormat.pbobjc.h"
3839

3940
@interface WireFormatTests : GPBTestCase
4041
@end

objectivec/google/protobuf/Any.pbobjc.h

+2-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objectivec/google/protobuf/Api.pbobjc.h

+117-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)