From e01e07b6e76ad6f571cefe679d112fede88cf1db Mon Sep 17 00:00:00 2001 From: Greg Clayton Date: Thu, 18 Apr 2013 18:10:51 +0000 Subject: Since we use C++11, we should switch over to using std::unique_ptr when C++11 is being used. To do this, we follow what we have done for shared pointers and we define a STD_UNIQUE_PTR macro that can be used and it will "do the right thing". Due to some API differences in std::unique_ptr and due to the fact that we need to be able to compile without C++11, we can't use move semantics so some code needed to change so that it can compile with either C++. Anyone wanting to use a unique_ptr or auto_ptr should now use the "STD_UNIQUE_PTR(TYPE)" macro. llvm-svn: 179779 --- lldb/source/Host/common/FileSpec.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lldb/source/Host/common/FileSpec.cpp') diff --git a/lldb/source/Host/common/FileSpec.cpp b/lldb/source/Host/common/FileSpec.cpp index c8cb96cc565..fab7ea1eccb 100644 --- a/lldb/source/Host/common/FileSpec.cpp +++ b/lldb/source/Host/common/FileSpec.cpp @@ -35,7 +35,6 @@ using namespace lldb; using namespace lldb_private; -using namespace std; static bool GetFileStats (const FileSpec *file_spec, struct stat *stats_ptr) @@ -745,7 +744,7 @@ DataBufferSP FileSpec::MemoryMapFileContents(off_t file_offset, size_t file_size) const { DataBufferSP data_sp; - auto_ptr mmap_data(new DataBufferMemoryMap()); + STD_UNIQUE_PTR(DataBufferMemoryMap) mmap_data(new DataBufferMemoryMap()); if (mmap_data.get()) { if (mmap_data->MemoryMapFromFileSpec (this, file_offset, file_size) >= file_size) @@ -863,7 +862,7 @@ FileSpec::ReadFileLines (STLStringArray &lines) char path[PATH_MAX]; if (GetPath(path, sizeof(path))) { - ifstream file_stream (path); + std::ifstream file_stream (path); if (file_stream) { -- cgit v1.2.3