[clang-tools-extra] r341451 - [clangd] Fix buildbot failures on older compilers from r341375

[Sam McCall via cfe-commits]

Author: sammccall
Date: Wed Sep  5 00:52:49 2018
New Revision: 341451

URL: http://llvm.org/viewvc/llvm-project?rev=341451&view=rev
Log:
[clangd] Fix buildbot failures on older compilers from r341375

Modified:
    clang-tools-extra/trunk/clangd/RIFF.cpp
    clang-tools-extra/trunk/clangd/index/Serialization.cpp

Modified: clang-tools-extra/trunk/clangd/RIFF.cpp
URL: 
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/RIFF.cpp?rev=341451&r1=341450&r2=341451&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/RIFF.cpp (original)
+++ clang-tools-extra/trunk/clangd/RIFF.cpp Wed Sep  5 00:52:49 2018
@@ -36,11 +36,11 @@ Expected<Chunk> readChunk(StringRef &Str
       return makeError("nonzero padding byte");
     Stream = Stream.drop_front();
   }
-  return C;
+  return std::move(C);
 };
 
 raw_ostream &operator<<(raw_ostream &OS, const Chunk &C) {
-  OS.write(C.ID.begin(), C.ID.size());
+  OS.write(C.ID.data(), C.ID.size());
   char Size[4];
   llvm::support::endian::write32le(Size, C.Data.size());
   OS.write(Size, sizeof(Size));
@@ -65,7 +65,7 @@ llvm::Expected<File> readFile(llvm::Stri
       F.Chunks.push_back(*Chunk);
     } else
       return Chunk.takeError();
-  return F;
+  return std::move(F);
 }
 
 raw_ostream &operator<<(raw_ostream &OS, const File &F) {
@@ -77,7 +77,7 @@ raw_ostream &operator<<(raw_ostream &OS,
   char Size[4];
   llvm::support::endian::write32le(Size, DataLen);
   OS.write(Size, sizeof(Size));
-  OS.write(F.Type.begin(), F.Type.size());
+  OS.write(F.Type.data(), F.Type.size());
   for (const auto &C : F.Chunks)
     OS << C;
   return OS;

Modified: clang-tools-extra/trunk/clangd/index/Serialization.cpp
URL: 
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/Serialization.cpp?rev=341451&r1=341450&r2=341451&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/index/Serialization.cpp (original)
+++ clang-tools-extra/trunk/clangd/index/Serialization.cpp Wed Sep  5 00:52:49 
2018
@@ -151,7 +151,7 @@ Expected<StringTableIn> readStringTable(
     Table.Strings.push_back(Saver.save(consume(Rest, Len)));
     Rest = Rest.drop_front();
   }
-  return Table;
+  return std::move(Table);
 }
 
 // SYMBOL ENCODING
@@ -272,7 +272,7 @@ Expected<Symbol> readSymbol(StringRef &D
   }
 
 #undef READ_STRING
-  return Sym;
+  return std::move(Sym);
 }
 
 } // namespace
@@ -322,7 +322,7 @@ Expected<IndexFileIn> readIndexFile(Stri
         return Sym.takeError();
     Result.Symbols = std::move(Symbols).build();
   }
-  return Result;
+  return std::move(Result);
 }
 
 raw_ostream &operator<<(raw_ostream &OS, const IndexFileOut &Data) {


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits