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/Protos/nanopb/google/api | |
| 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/Protos/nanopb/google/api')
| -rw-r--r-- | Firestore/Protos/nanopb/google/api/annotations.nanopb.h (renamed from Firestore/Protos/nanopb/google/api/annotations.pb.h) | 4 | ||||
| -rw-r--r-- | Firestore/Protos/nanopb/google/api/annotations.pb.c | 4 | ||||
| -rw-r--r-- | Firestore/Protos/nanopb/google/api/http.nanopb.h (renamed from Firestore/Protos/nanopb/google/api/http.pb.h) | 2 | ||||
| -rw-r--r-- | Firestore/Protos/nanopb/google/api/http.pb.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Firestore/Protos/nanopb/google/api/annotations.pb.h b/Firestore/Protos/nanopb/google/api/annotations.nanopb.h index 33c9ba8..9a7854d 100644 --- a/Firestore/Protos/nanopb/google/api/annotations.pb.h +++ b/Firestore/Protos/nanopb/google/api/annotations.nanopb.h @@ -15,13 +15,13 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ +/* Generated by nanopb-0.3.8 at Fri Jun 1 18:36:44 2018. */ #ifndef PB_GOOGLE_API_ANNOTATIONS_PB_H_INCLUDED #define PB_GOOGLE_API_ANNOTATIONS_PB_H_INCLUDED #include <pb.h> -#include "google/api/http.pb.h" +#include "google/api/http.nanopb.h" /* @@protoc_insertion_point(includes) */ #if PB_PROTO_HEADER_VERSION != 30 diff --git a/Firestore/Protos/nanopb/google/api/annotations.pb.c b/Firestore/Protos/nanopb/google/api/annotations.pb.c index 6da5206..ff6f44b 100644 --- a/Firestore/Protos/nanopb/google/api/annotations.pb.c +++ b/Firestore/Protos/nanopb/google/api/annotations.pb.c @@ -15,9 +15,9 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ +/* Generated by nanopb-0.3.8 at Fri Jun 1 18:36:44 2018. */ -#include "annotations.pb.h" +#include "annotations.nanopb.h" /* @@protoc_insertion_point(includes) */ #if PB_PROTO_HEADER_VERSION != 30 diff --git a/Firestore/Protos/nanopb/google/api/http.pb.h b/Firestore/Protos/nanopb/google/api/http.nanopb.h index a7bbc46..4ff3efe 100644 --- a/Firestore/Protos/nanopb/google/api/http.pb.h +++ b/Firestore/Protos/nanopb/google/api/http.nanopb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.3.8 at Thu Apr 12 07:27:15 2018. */ +/* Generated by nanopb-0.3.8 at Fri Jun 1 18:36:44 2018. */ #ifndef PB_GOOGLE_API_HTTP_PB_H_INCLUDED #define PB_GOOGLE_API_HTTP_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/google/api/http.pb.c b/Firestore/Protos/nanopb/google/api/http.pb.c index 7a2cd21..c0d1114 100644 --- a/Firestore/Protos/nanopb/google/api/http.pb.c +++ b/Firestore/Protos/nanopb/google/api/http.pb.c @@ -15,9 +15,9 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.3.8 at Thu Apr 12 07:27:15 2018. */ +/* Generated by nanopb-0.3.8 at Fri Jun 1 18:36:44 2018. */ -#include "http.pb.h" +#include "http.nanopb.h" /* @@protoc_insertion_point(includes) */ #if PB_PROTO_HEADER_VERSION != 30 |