summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support/LockFileManager.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-07-06 17:43:13 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-07-06 17:43:13 +0000
commitadf21f2a5634f2b33b6aa2dffae67df50c72a9f2 (patch)
treeab58d9d0ff55fb26656a0152b43539b19657b9dc /llvm/lib/Support/LockFileManager.cpp
parent178cadafc1a7fc576b6f4eb86a598c24247ccad7 (diff)
downloadbcm5719-llvm-adf21f2a5634f2b33b6aa2dffae67df50c72a9f2.tar.gz
bcm5719-llvm-adf21f2a5634f2b33b6aa2dffae67df50c72a9f2.zip
Update the MemoryBuffer API to use ErrorOr.
llvm-svn: 212405
Diffstat (limited to 'llvm/lib/Support/LockFileManager.cpp')
-rw-r--r--llvm/lib/Support/LockFileManager.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Support/LockFileManager.cpp b/llvm/lib/Support/LockFileManager.cpp
index 681bae2ba18..3f224e0c588 100644
--- a/llvm/lib/Support/LockFileManager.cpp
+++ b/llvm/lib/Support/LockFileManager.cpp
@@ -33,11 +33,13 @@ Optional<std::pair<std::string, int> >
LockFileManager::readLockFile(StringRef LockFileName) {
// Read the owning host and PID out of the lock file. If it appears that the
// owning process is dead, the lock file is invalid.
- std::unique_ptr<MemoryBuffer> MB;
- if (MemoryBuffer::getFile(LockFileName, MB)) {
+ ErrorOr<std::unique_ptr<MemoryBuffer>> MBOrErr =
+ MemoryBuffer::getFile(LockFileName);
+ if (!MBOrErr) {
sys::fs::remove(LockFileName);
return None;
}
+ std::unique_ptr<MemoryBuffer> MB = std::move(MBOrErr.get());
StringRef Hostname;
StringRef PIDStr;
OpenPOWER on IntegriCloud