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

diff --git a/Firestore/Protos/nanopb/firestore/local/target.nanopb.h b/Firestore/Protos/nanopb/firestore/local/target.nanopb.h
new file mode 100644
index 0000000..af6cf9c
--- /dev/null
+++ b/Firestore/Protos/nanopb/firestore/local/target.nanopb.h
@@ -0,0 +1,100 @@
+/*
+ * 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_TARGET_PB_H_INCLUDED
+#define PB_FIRESTORE_CLIENT_TARGET_PB_H_INCLUDED
+#include <pb.h>
+
+#include "google/firestore/v1beta1/firestore.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_Target {
+    int32_t target_id;
+    google_protobuf_Timestamp snapshot_version;
+    pb_callback_t resume_token;
+    int64_t last_listen_sequence_number;
+    pb_size_t which_target_type;
+    union {
+        google_firestore_v1beta1_Target_QueryTarget query;
+        google_firestore_v1beta1_Target_DocumentsTarget documents;
+    } target_type;
+/* @@protoc_insertion_point(struct:firestore_client_Target) */
+} firestore_client_Target;
+
+typedef struct _firestore_client_TargetGlobal {
+    int32_t highest_target_id;
+    int64_t highest_listen_sequence_number;
+    google_protobuf_Timestamp last_remote_snapshot_version;
+    int32_t target_count;
+/* @@protoc_insertion_point(struct:firestore_client_TargetGlobal) */
+} firestore_client_TargetGlobal;
+
+/* Default values for struct fields */
+
+/* Initializer values for message structs */
+#define firestore_client_Target_init_default     {0, google_protobuf_Timestamp_init_default, {{NULL}, NULL}, 0, 0, {google_firestore_v1beta1_Target_QueryTarget_init_default}}
+#define firestore_client_TargetGlobal_init_default {0, 0, google_protobuf_Timestamp_init_default, 0}
+#define firestore_client_Target_init_zero        {0, google_protobuf_Timestamp_init_zero, {{NULL}, NULL}, 0, 0, {google_firestore_v1beta1_Target_QueryTarget_init_zero}}
+#define firestore_client_TargetGlobal_init_zero  {0, 0, google_protobuf_Timestamp_init_zero, 0}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define firestore_client_Target_query_tag        5
+#define firestore_client_Target_documents_tag    6
+#define firestore_client_Target_target_id_tag    1
+#define firestore_client_Target_snapshot_version_tag 2
+#define firestore_client_Target_resume_token_tag 3
+#define firestore_client_Target_last_listen_sequence_number_tag 4
+#define firestore_client_TargetGlobal_highest_target_id_tag 1
+#define firestore_client_TargetGlobal_highest_listen_sequence_number_tag 2
+#define firestore_client_TargetGlobal_last_remote_snapshot_version_tag 3
+#define firestore_client_TargetGlobal_target_count_tag 4
+
+/* Struct field encoding specification for nanopb */
+extern const pb_field_t firestore_client_Target_fields[7];
+extern const pb_field_t firestore_client_TargetGlobal_fields[5];
+
+/* Maximum encoded size of messages (where known) */
+/* firestore_client_Target_size depends on runtime parameters */
+#define firestore_client_TargetGlobal_size       57
+
+/* Message IDs (where set with "msgid" option) */
+#ifdef PB_MSGID
+
+#define TARGET_MESSAGES \
+
+
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+/* @@protoc_insertion_point(eof) */
+
+#endif