diff options
author | Rich Gowman <rgowman@google.com> | 2018-06-12 10:27:17 -0400 |
---|---|---|
committer | Rich Gowman <rgowman@google.com> | 2018-06-12 10:27:17 -0400 |
commit | cf2899a085f7ceca3fad2d1fb5336be25cecd7ff (patch) | |
tree | 38c835a29fcda279c8dd220781d2b5c726da307f /Firestore/Source/Model/FSTFieldValue.mm | |
parent | 1597765af8c897ab73d21d6d404f8eeede7890b1 (diff) | |
parent | 9307f4893008f7d6cf9473e906d4c896546c5c8c (diff) |
Merge remote-tracking branch 'origin/master' into rsgowman/protobuf_cpp
Also "fixed" BadFieldValueTagWithOtherValidTagsPresent test by changing
'false' to 'true'. Details: Depending on the version of nanopb, nanopb
would explicitly encode 'false', which shouldn't be done in proto3. When
it's explicitly encoded, the test worked properly. But when it was
(properly) dropped, the invalid tag is the only field that's actually
encoded, thus violating the assumptions of the test, leading to a test
failure. s/false/true fixes it, as now the boolean_value field is
(properly) encoded regardless of version.
Diffstat (limited to 'Firestore/Source/Model/FSTFieldValue.mm')
-rw-r--r-- | Firestore/Source/Model/FSTFieldValue.mm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Firestore/Source/Model/FSTFieldValue.mm b/Firestore/Source/Model/FSTFieldValue.mm index 6a13511..4acae7d 100644 --- a/Firestore/Source/Model/FSTFieldValue.mm +++ b/Firestore/Source/Model/FSTFieldValue.mm @@ -690,13 +690,12 @@ static NSComparisonResult CompareBytes(NSData *left, NSData *right) { - (NSComparisonResult)compare:(FSTFieldValue *)other { if ([other isKindOfClass:[FSTReferenceValue class]]) { FSTReferenceValue *ref = (FSTReferenceValue *)other; - NSComparisonResult cmp = [util::WrapNSStringNoCopy(self.databaseID->project_id()) - compare:util::WrapNSStringNoCopy(ref.databaseID->project_id())]; + NSComparisonResult cmp = + WrapCompare(self.databaseID->project_id(), ref.databaseID->project_id()); if (cmp != NSOrderedSame) { return cmp; } - cmp = [util::WrapNSStringNoCopy(self.databaseID->database_id()) - compare:util::WrapNSStringNoCopy(ref.databaseID->database_id())]; + cmp = WrapCompare(self.databaseID->database_id(), ref.databaseID->database_id()); return cmp != NSOrderedSame ? cmp : [self.key compare:ref.key]; } else { return [self defaultCompare:other]; |