averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace llvm::OwningPtr with std::unique_ptr

Browse Source 
It looks like llvm::OwningPtr is going to be removed soon.


Swift SVN r14729
This commit is contained in:
Dmitri Hrybenko
2014-03-06 09:47:17 +00:00
parent 07cb1c935a
commit f232267f23
16 changed files with 52 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Driver/OutputFileMap.cpp
View File

@@ -11,8 +11,6 @@
//===----------------------------------------------------------------------===//
#include "swift/Driver/OutputFileMap.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/system_error.h"
@@ -21,25 +19,25 @@ using namespace swift;
using namespace swift::driver;
std::unique_ptr<OutputFileMap> OutputFileMap::loadFromPath(StringRef Path) {
llvm::OwningPtr<llvm::MemoryBuffer> Buffer;
std::unique_ptr<llvm::MemoryBuffer> Buffer;
llvm::error_code Result = llvm::MemoryBuffer::getFile(Path, Buffer);
if (Result != 0)
return nullptr;
return loadFromBuffer(Buffer.take());
return loadFromBuffer(std::move(Buffer));
}
std::unique_ptr<OutputFileMap> OutputFileMap::loadFromBuffer(StringRef Data) {
llvm::OwningPtr<llvm::MemoryBuffer> Buffer{
std::unique_ptr<llvm::MemoryBuffer> Buffer{
llvm::MemoryBuffer::getMemBuffer(Data)
};
return loadFromBuffer(Buffer.take());
return loadFromBuffer(std::move(Buffer));
}
std::unique_ptr<OutputFileMap>
OutputFileMap::loadFromBuffer(llvm::MemoryBuffer *Buffer) {
OutputFileMap::loadFromBuffer(std::unique_ptr<llvm::MemoryBuffer> Buffer) {
std::unique_ptr<OutputFileMap> OFM(new OutputFileMap());
if (OFM->parse(Buffer))
if (OFM->parse(std::move(Buffer)))
return nullptr;
return OFM;
@@ -91,9 +89,9 @@ void OutputFileMap::dump(llvm::raw_ostream &os, bool Sort) const {
}
}
bool OutputFileMap::parse(llvm::MemoryBuffer *Buffer) {
bool OutputFileMap::parse(std::unique_ptr<llvm::MemoryBuffer> Buffer) {
llvm::SourceMgr SM;
llvm::yaml::Stream YAMLStream(Buffer, SM);
llvm::yaml::Stream YAMLStream(Buffer.release(), SM);
auto I = YAMLStream.begin();
if (I == YAMLStream.end())
return true;