nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace OwningPtr with std::unique_ptr.

Browse Source 
This compiles cleanly with lldb/lld/clang-tools-extra/llvm.

llvm-svn: 203279
This commit is contained in:
Ahmed Charles
2014-03-07 20:03:18 +00:00
parent 629afaefe0
commit b89843299a
154 changed files with 511 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Tooling/JSONCompilationDatabase.cpp
View File

@@ -122,7 +122,7 @@ class JSONCompilationDatabasePlugin : public CompilationDatabasePlugin {
StringRef Directory, std::string &ErrorMessage) {
SmallString<1024> JSONDatabasePath(Directory);
llvm::sys::path::append(JSONDatabasePath, "compile_commands.json");
OwningPtr<CompilationDatabase> Database(
std::unique_ptr<CompilationDatabase> Database(
JSONCompilationDatabase::loadFromFile(JSONDatabasePath, ErrorMessage));
if (!Database)
return NULL;
@@ -144,14 +144,14 @@ volatile int JSONAnchorSource = 0;
JSONCompilationDatabase *
JSONCompilationDatabase::loadFromFile(StringRef FilePath,
std::string &ErrorMessage) {
OwningPtr<llvm::MemoryBuffer> DatabaseBuffer;
std::unique_ptr<llvm::MemoryBuffer> DatabaseBuffer;
llvm::error_code Result =
llvm::MemoryBuffer::getFile(FilePath, DatabaseBuffer);
if (Result != 0) {
ErrorMessage = "Error while opening JSON database: " + Result.message();
return NULL;
}
OwningPtr<JSONCompilationDatabase> Database(
std::unique_ptr<JSONCompilationDatabase> Database(
new JSONCompilationDatabase(DatabaseBuffer.release()));
if (!Database->parse(ErrorMessage))
return NULL;
@@ -161,9 +161,9 @@ JSONCompilationDatabase::loadFromFile(StringRef FilePath,
JSONCompilationDatabase *
JSONCompilationDatabase::loadFromBuffer(StringRef DatabaseString,
std::string &ErrorMessage) {
OwningPtr<llvm::MemoryBuffer> DatabaseBuffer(
std::unique_ptr<llvm::MemoryBuffer> DatabaseBuffer(
llvm::MemoryBuffer::getMemBuffer(DatabaseString));
OwningPtr<JSONCompilationDatabase> Database(
std::unique_ptr<JSONCompilationDatabase> Database(
new JSONCompilationDatabase(DatabaseBuffer.release()));
if (!Database->parse(ErrorMessage))
return NULL;