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.

1 files changed, 107 insertions, 0 deletions

diff --git a/Firestore/Protos/nanopb/google/api/http.nanopb.h b/Firestore/Protos/nanopb/google/api/http.nanopb.h
new file mode 100644
index 0000000..4ff3efe
--- /dev/null
+++ b/Firestore/Protos/nanopb/google/api/http.nanopb.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Automatically generated nanopb header */
+/* 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
+#include <pb.h>
+
+/* @@protoc_insertion_point(includes) */
+#if PB_PROTO_HEADER_VERSION != 30
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Struct definitions */
+typedef struct _google_api_CustomHttpPattern {
+    pb_callback_t kind;
+    pb_callback_t path;
+/* @@protoc_insertion_point(struct:google_api_CustomHttpPattern) */
+} google_api_CustomHttpPattern;
+
+typedef struct _google_api_Http {
+    pb_callback_t rules;
+    bool fully_decode_reserved_expansion;
+/* @@protoc_insertion_point(struct:google_api_Http) */
+} google_api_Http;
+
+typedef struct _google_api_HttpRule {
+    pb_callback_t selector;
+    pb_callback_t get;
+    pb_callback_t put;
+    pb_callback_t post;
+    pb_callback_t delete_;
+    pb_callback_t patch;
+    pb_callback_t body;
+    google_api_CustomHttpPattern custom;
+    pb_callback_t additional_bindings;
+/* @@protoc_insertion_point(struct:google_api_HttpRule) */
+} google_api_HttpRule;
+
+/* Default values for struct fields */
+
+/* Initializer values for message structs */
+#define google_api_Http_init_default             {{{NULL}, NULL}, 0}
+#define google_api_HttpRule_init_default         {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, google_api_CustomHttpPattern_init_default, {{NULL}, NULL}}
+#define google_api_CustomHttpPattern_init_default {{{NULL}, NULL}, {{NULL}, NULL}}
+#define google_api_Http_init_zero                {{{NULL}, NULL}, 0}
+#define google_api_HttpRule_init_zero            {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, google_api_CustomHttpPattern_init_zero, {{NULL}, NULL}}
+#define google_api_CustomHttpPattern_init_zero   {{{NULL}, NULL}, {{NULL}, NULL}}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define google_api_CustomHttpPattern_kind_tag    1
+#define google_api_CustomHttpPattern_path_tag    2
+#define google_api_Http_rules_tag                1
+#define google_api_Http_fully_decode_reserved_expansion_tag 2
+#define google_api_HttpRule_selector_tag         1
+#define google_api_HttpRule_get_tag              2
+#define google_api_HttpRule_put_tag              3
+#define google_api_HttpRule_post_tag             4
+#define google_api_HttpRule_delete_tag           5
+#define google_api_HttpRule_patch_tag            6
+#define google_api_HttpRule_custom_tag           8
+#define google_api_HttpRule_body_tag             7
+#define google_api_HttpRule_additional_bindings_tag 11
+
+/* Struct field encoding specification for nanopb */
+extern const pb_field_t google_api_Http_fields[3];
+extern const pb_field_t google_api_HttpRule_fields[10];
+extern const pb_field_t google_api_CustomHttpPattern_fields[3];
+
+/* Maximum encoded size of messages (where known) */
+/* google_api_Http_size depends on runtime parameters */
+/* google_api_HttpRule_size depends on runtime parameters */
+/* google_api_CustomHttpPattern_size depends on runtime parameters */
+
+/* Message IDs (where set with "msgid" option) */
+#ifdef PB_MSGID
+
+#define HTTP_MESSAGES \
+
+
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+/* @@protoc_insertion_point(eof) */
+
+#endif