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, 87 insertions, 0 deletions

diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h
new file mode 100644
index 0000000..c3b2b96
--- /dev/null
+++ b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h
@@ -0,0 +1,87 @@
+/*
+ * 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_FIRESTORE_CLIENT_MUTATION_PB_H_INCLUDED
+#define PB_FIRESTORE_CLIENT_MUTATION_PB_H_INCLUDED
+#include <pb.h>
+
+#include "google/firestore/v1beta1/write.nanopb.h"
+
+#include "google/protobuf/timestamp.nanopb.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 _firestore_client_MutationQueue {
+    int32_t last_acknowledged_batch_id;
+    pb_callback_t last_stream_token;
+/* @@protoc_insertion_point(struct:firestore_client_MutationQueue) */
+} firestore_client_MutationQueue;
+
+typedef struct _firestore_client_WriteBatch {
+    int32_t batch_id;
+    pb_callback_t writes;
+    google_protobuf_Timestamp local_write_time;
+/* @@protoc_insertion_point(struct:firestore_client_WriteBatch) */
+} firestore_client_WriteBatch;
+
+/* Default values for struct fields */
+
+/* Initializer values for message structs */
+#define firestore_client_MutationQueue_init_default {0, {{NULL}, NULL}}
+#define firestore_client_WriteBatch_init_default {0, {{NULL}, NULL}, google_protobuf_Timestamp_init_default}
+#define firestore_client_MutationQueue_init_zero {0, {{NULL}, NULL}}
+#define firestore_client_WriteBatch_init_zero    {0, {{NULL}, NULL}, google_protobuf_Timestamp_init_zero}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define firestore_client_MutationQueue_last_acknowledged_batch_id_tag 1
+#define firestore_client_MutationQueue_last_stream_token_tag 2
+#define firestore_client_WriteBatch_batch_id_tag 1
+#define firestore_client_WriteBatch_writes_tag   2
+#define firestore_client_WriteBatch_local_write_time_tag 3
+
+/* Struct field encoding specification for nanopb */
+extern const pb_field_t firestore_client_MutationQueue_fields[3];
+extern const pb_field_t firestore_client_WriteBatch_fields[4];
+
+/* Maximum encoded size of messages (where known) */
+/* firestore_client_MutationQueue_size depends on runtime parameters */
+/* firestore_client_WriteBatch_size depends on runtime parameters */
+
+/* Message IDs (where set with "msgid" option) */
+#ifdef PB_MSGID
+
+#define MUTATION_MESSAGES \
+
+
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+/* @@protoc_insertion_point(eof) */
+
+#endif