Fix build

Author: schmidt-sebastian

Firestore/core/src/model/object_value.cc

@@ -81,7 +81,7 @@ size_t CalculateSizeOfUnion(
   // minus the number of deleted entries.
   return upserts.size() +
          std::count_if(
-             map_value->fields, map_value->fields + map_value->fields_count,
+             map_value.fields, map_value.fields + map_value.fields_count,
              [&](const google_firestore_v1_MapValue_FieldsEntry& entry) {
                std::string field = MakeString(entry.key);
                // Don't count if entry is deleted or if it is a replacement
@@ -114,10 +114,10 @@ void ApplyChanges(
   // Merge the existing data with the deletes and updates
   for (pb_size_t source_index = 0, target_index = 0;
        target_index < target_count;) {
-    if (source_index < source_count) {
-      auto& source_entry = source_fields[source_index];
-      auto& target_entry = target_fields[target_index];
+    auto& source_entry = source_fields[source_index];
+    auto& target_entry = target_fields[target_index];
 
+    if (source_index < source_count) {
       std::string source_key = MakeString(source_entry.key);
 
       // Check if the source key is deleted

Firestore/core/src/nanopb/fields_array.h

@@ -23,6 +23,7 @@
 #include "Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h"
 #include "Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h"
 #include "Firestore/Protos/nanopb/google/type/latlng.nanopb.h"
+#include "Firestore/core/src/nanopb/message.h"
 
 namespace firebase {
 namespace firestore {
@@ -132,6 +133,12 @@ inline const pb_field_t* FieldsArray<google_firestore_v1_Value>() {
   return google_firestore_v1_Value_fields;
 }
 
+template <>
+inline const pb_field_t*
+FieldsArray<google_firestore_v1_MapValue_FieldsEntry>() {
+  return google_firestore_v1_MapValue_FieldsEntry_fields;
+}
+
 template <>
 inline const pb_field_t* FieldsArray<google_firestore_v1_Write>() {
   return google_firestore_v1_Write_fields;