Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use composer action for dependency caching.

Browse Source 
This will reduce the flakes we've seen in PHP tests.

PiperOrigin-RevId: 534226922
pull/12883/head
Mike Kruskal 2 years ago committed by Copybara-Service
parent 03c49f355d
commit 9657172749
11 changed files with 86 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      .github/workflows/test_php.yml
  2. 4
      objectivec/GPBAny.pbobjc.m
  3. 12
      objectivec/GPBApi.pbobjc.m
  4. 4
      objectivec/GPBDuration.pbobjc.m
  5. 4
      objectivec/GPBEmpty.pbobjc.m
  6. 4
      objectivec/GPBFieldMask.pbobjc.m
  7. 4
      objectivec/GPBSourceContext.pbobjc.m
  8. 12
      objectivec/GPBStruct.pbobjc.m
  9. 4
      objectivec/GPBTimestamp.pbobjc.m
  10. 20
      objectivec/GPBType.pbobjc.m
  11. 36
      objectivec/GPBWrappers.pbobjc.m

45
.github/workflows/test_php.yml
Unescape View File

@ -15,23 +15,29 @@ jobs:
matrix: matrix:
include: include:
- name: 7.3 Debug - name: 7.3 Debug
version-short: "7.3"
version: 7.3.28-dbg version: 7.3.28-dbg
command: composer test \&\& composer test_c command: composer test \&\& composer test_c
- name: 7.4 Debug - name: 7.4 Debug
version-short: "7.4"
version: 7.4.18-dbg version: 7.4.18-dbg
command: composer test \&\& composer test_c command: composer test \&\& composer test_c
- name: 8.0 Optimized - name: 8.0 Optimized
version: 8.0.5 version: "8.0.5"
version-short: "8.0"
command: composer test \&\& composer test_c command: composer test \&\& composer test_c
- name: 8.0 Debug - name: 8.0 Debug
version: 8.0.5-dbg version: 8.0.5-dbg
version-short: "8.0"
command: composer test \&\& composer test_c command: composer test \&\& composer test_c
- name: 8.0 Memory Leak - name: 8.0 Memory Leak
version: 8.0.5-dbg version: 8.0.5-dbg
version-short: "8.0"
# Run specialized memory leak & multirequest tests. # Run specialized memory leak & multirequest tests.
command: composer test_c \&\& tests/multirequest.sh \&\& tests/memory_leak_test.sh command: composer test_c \&\& tests/multirequest.sh \&\& tests/memory_leak_test.sh
- name: 8.0 Valgrind - name: 8.0 Valgrind
version: 8.0.5-dbg version: 8.0.5-dbg
version-short: "8.0"
command: composer test_valgrind command: composer test_valgrind
name: Linux ${{ matrix.name}} name: Linux ${{ matrix.name}}
@ -41,8 +47,12 @@ jobs:
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
with: with:
ref: ${{ inputs.safe-checkout }} ref: ${{ inputs.safe-checkout }}
- name: Update submodules submodules: recursive
run: git submodule update --init --remote --recursive - name: Setup composer
uses: protocolbuffers/protobuf-ci/composer-setup@v1
with:
cache-prefix: php-${{ matrix.version-short }}
directory: php
- name: Run tests - name: Run tests
uses: protocolbuffers/protobuf-ci/docker@v1 uses: protocolbuffers/protobuf-ci/docker@v1
with: with:
@ -75,9 +85,7 @@ jobs:
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
with: with:
ref: ${{ inputs.safe-checkout }} ref: ${{ inputs.safe-checkout }}
submodules: recursive
- name: Update submodules
run: git submodule update --init --remote --recursive
- name: Cross compile protoc for i386 - name: Cross compile protoc for i386
id: cross-compile id: cross-compile
@ -87,6 +95,12 @@ jobs:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-i386 architecture: linux-i386
- name: Setup composer
uses: protocolbuffers/protobuf-ci/composer-setup@v1
with:
cache-prefix: php-${{ matrix.version }}
directory: php
- name: Run tests - name: Run tests
uses: protocolbuffers/protobuf-ci/docker@v1 uses: protocolbuffers/protobuf-ci/docker@v1
with: with:
@ -119,6 +133,12 @@ jobs:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-aarch64 architecture: linux-aarch64
- name: Setup composer
uses: protocolbuffers/protobuf-ci/composer-setup@v1
with:
cache-prefix: php-7.3
directory: php
- name: Run tests - name: Run tests
uses: protocolbuffers/protobuf-ci/docker@v1 uses: protocolbuffers/protobuf-ci/docker@v1
with: with:
@ -148,11 +168,7 @@ jobs:
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
with: with:
ref: ${{ inputs.safe-checkout }} ref: ${{ inputs.safe-checkout }}
submodules: recursive
# Initialize/update the submodule from remote to validate a new fetch based on .gitmodules
# We have to do this separately since actions/checkout doesn't support the "--remote" flag
- name: Update submodules
run: git submodule update --init --remote --recursive
- name: Uninstall problematic libgd - name: Uninstall problematic libgd
run: brew uninstall --ignore-dependencies gd run: brew uninstall --ignore-dependencies gd
@ -168,6 +184,12 @@ jobs:
- name: Check PHP version - name: Check PHP version
run: php --version | grep ${{ matrix.version }} || (echo "Invalid PHP version - $(php --version)" && exit 1) run: php --version | grep ${{ matrix.version }} || (echo "Invalid PHP version - $(php --version)" && exit 1)
- name: Setup composer
uses: protocolbuffers/protobuf-ci/composer-setup@v1
with:
cache-prefix: php-${{ matrix.version }}
directory: php
- name: Run tests - name: Run tests
uses: protocolbuffers/protobuf-ci/bazel@v1 uses: protocolbuffers/protobuf-ci/bazel@v1
with: with:
@ -175,7 +197,6 @@ jobs:
bazel-cache: php_macos/${{ matrix.version }} bazel-cache: php_macos/${{ matrix.version }}
bash: | bash: |
pushd php pushd php
rm -rf vendor
php -v php -v
php -m php -m
composer update composer update

4
objectivec/GPBAny.pbobjc.m
Unescape View File

@ -91,9 +91,9 @@ typedef struct GPBAny__storage_ {
"\001\001\004\241!!\000"; "\001\001\004\241!!\000";
[localDescriptor setupExtraTextInfo:extraTextFormatInfo]; [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
#endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS #endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

12
objectivec/GPBApi.pbobjc.m
Unescape View File

@ -145,9 +145,9 @@ typedef struct GPBApi__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBApi__storage_) storageSize:sizeof(GPBApi__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -272,9 +272,9 @@ typedef struct GPBMethod__storage_ {
"\002\002\007\244\241!!\000\004\010\244\241!!\000"; "\002\002\007\244\241!!\000\004\010\244\241!!\000";
[localDescriptor setupExtraTextInfo:extraTextFormatInfo]; [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
#endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS #endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -341,9 +341,9 @@ typedef struct GPBMixin__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBMixin__storage_) storageSize:sizeof(GPBMixin__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBDuration.pbobjc.m
Unescape View File

@ -86,9 +86,9 @@ typedef struct GPBDuration__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBDuration__storage_) storageSize:sizeof(GPBDuration__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBEmpty.pbobjc.m
Unescape View File

@ -62,9 +62,9 @@ typedef struct GPBEmpty__storage_ {
fieldCount:0 fieldCount:0
storageSize:sizeof(GPBEmpty__storage_) storageSize:sizeof(GPBEmpty__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBFieldMask.pbobjc.m
Unescape View File

@ -75,9 +75,9 @@ typedef struct GPBFieldMask__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBFieldMask__storage_) storageSize:sizeof(GPBFieldMask__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBSourceContext.pbobjc.m
Unescape View File

@ -75,9 +75,9 @@ typedef struct GPBSourceContext__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBSourceContext__storage_) storageSize:sizeof(GPBSourceContext__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

12
objectivec/GPBStruct.pbobjc.m
Unescape View File

@ -115,9 +115,9 @@ typedef struct GPBStruct__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBStruct__storage_) storageSize:sizeof(GPBStruct__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -222,9 +222,9 @@ typedef struct GPBValue__storage_ {
[localDescriptor setupOneofs:oneofs [localDescriptor setupOneofs:oneofs
count:(uint32_t)(sizeof(oneofs) / sizeof(char*)) count:(uint32_t)(sizeof(oneofs) / sizeof(char*))
firstHasIndex:-1]; firstHasIndex:-1];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -285,9 +285,9 @@ typedef struct GPBListValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBListValue__storage_) storageSize:sizeof(GPBListValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBTimestamp.pbobjc.m
Unescape View File

@ -86,9 +86,9 @@ typedef struct GPBTimestamp__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBTimestamp__storage_) storageSize:sizeof(GPBTimestamp__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

20
objectivec/GPBType.pbobjc.m
Unescape View File

@ -307,9 +307,9 @@ typedef struct GPBType__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBType__storage_) storageSize:sizeof(GPBType__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -468,9 +468,9 @@ typedef struct GPBField__storage_ {
"\001\006\004\241!!\000"; "\001\006\004\241!!\000";
[localDescriptor setupExtraTextInfo:extraTextFormatInfo]; [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
#endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS #endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -593,9 +593,9 @@ typedef struct GPBEnum__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBEnum__storage_) storageSize:sizeof(GPBEnum__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -673,9 +673,9 @@ typedef struct GPBEnumValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBEnumValue__storage_) storageSize:sizeof(GPBEnumValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -730,9 +730,9 @@ typedef struct GPBOption__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBOption__storage_) storageSize:sizeof(GPBOption__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

36
objectivec/GPBWrappers.pbobjc.m
Unescape View File

@ -83,9 +83,9 @@ typedef struct GPBDoubleValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBDoubleValue__storage_) storageSize:sizeof(GPBDoubleValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -129,9 +129,9 @@ typedef struct GPBFloatValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBFloatValue__storage_) storageSize:sizeof(GPBFloatValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -175,9 +175,9 @@ typedef struct GPBInt64Value__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBInt64Value__storage_) storageSize:sizeof(GPBInt64Value__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -221,9 +221,9 @@ typedef struct GPBUInt64Value__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBUInt64Value__storage_) storageSize:sizeof(GPBUInt64Value__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -267,9 +267,9 @@ typedef struct GPBInt32Value__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBInt32Value__storage_) storageSize:sizeof(GPBInt32Value__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -313,9 +313,9 @@ typedef struct GPBUInt32Value__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBUInt32Value__storage_) storageSize:sizeof(GPBUInt32Value__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -358,9 +358,9 @@ typedef struct GPBBoolValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBBoolValue__storage_) storageSize:sizeof(GPBBoolValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -404,9 +404,9 @@ typedef struct GPBStringValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBStringValue__storage_) storageSize:sizeof(GPBStringValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -450,9 +450,9 @@ typedef struct GPBBytesValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBBytesValue__storage_) storageSize:sizeof(GPBBytesValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

Write Preview
Loading…
Cancel
Save