From 4cdaefdf38f0735d57cb5942d588cd6f39397e37 Mon Sep 17 00:00:00 2001
From: zxu <zxu@google.com>
Date: Tue, 22 May 2018 10:45:03 -0400
Subject: fix build for Firestore copybara import (#1308)

* fix "target of using declaration conflicts with declaration already in scope"

* fix "call to implicitly-deleted copy constructor of *unique_ptr*"
---
 Firestore/core/src/firebase/firestore/remote/serializer.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Firestore/core/src/firebase/firestore/remote')

diff --git a/Firestore/core/src/firebase/firestore/remote/serializer.cc b/Firestore/core/src/firebase/firestore/remote/serializer.cc
index 2ed5f54..26a06c6 100644
--- a/Firestore/core/src/firebase/firestore/remote/serializer.cc
+++ b/Firestore/core/src/firebase/firestore/remote/serializer.cc
@@ -485,7 +485,7 @@ Serializer::DecodeMaybeDocument(const uint8_t* bytes, size_t length) const {
       DecodeBatchGetDocumentsResponse(&reader);
 
   if (reader.status().ok()) {
-    return maybeDoc;
+    return std::move(maybeDoc);
   } else {
     return reader.status();
   }
-- 
cgit v1.2.3