[Lldb-commits] [lldb] r179779 - 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 wi...

Malea, Daniel daniel.malea at intel.com
Thu Apr 18 11:54:48 PDT 2013


will clean up buildbot warnings :) I'm
still seeing some uses of unity/SharingPtr.h
201:    std::auto_ptr<Y> hold(p);

./lldb/Expression/Im_data;

./lldb/Expression/Materializer.h
146:    typede7:    std::unique_ptr<Log> m_log_ap

./lldb/API/SBValueList.h
8ld these be changed also? I believe the CheckPublicAPIHeaders test
case is failing because of the SBValueList.h uses std::unique_ptr (as the
test case is not built with c++11) support.



Thanks,
Dan

On 2013-04-18 2:10 PM, "Greg Clayton" <clayton at apple.com> wrote:

>Author: gclayton
>Date: Thu Apr 18 13:10:51 2013
>New Revision: 179779
>
>URL: http://llvm.org/viewvc/llvmproject?rev=179779&view=rev
>Log:
>Since we us C++11, we should switch over to using std::unique_ptr when
>C++1 is being used. To do this, we follow what we have done for shared
>pointers and we define a STD_UNIQUEPTR macro that can be used and it
>will "do the right thing". Dueto 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.
>
>
>Modified:
>    lldb/trunk/include/lldb/API/SBAddress.h
>    lldb/trunk/include/lldb/API/SBCommandReturnObject.h
>    lldb/trunk/include/lldb/API/SBDeclaration.h
>    lldb/trunk/include/lldb/API/SBError.h
>    lldb/trunk/include/lldb/API/SBExpressionOptions.h
>    lldb/trunk/include/lldb/API/SBFileSpec.h
>    lldb/trunk/include/lldb/API/SBFileSpecList.h
>    lldb/trunk/include/lldb/API/SBLineEntry.h
>    lldb/trunk/include/lldb/API/SBSourceManager.h
>    lldb/trunk/include/lldb/API/SBStream.h
>    lldb/trunk/include/lldb/API/SBStringList.h
>    lldb/trunk/include/lldb/API/SBSymbolContext.h
>    lldb/trunk/include/lldb/API/SBSymbolContextList.h
>    lldb/trunk/includ/lldb/API/SBType.h
>    lldb/trunk/include/lldb/Breakpoint/Breakpointocation.h
>    lldb/trunk/include/lldb/Breakpoint/BreakpointOptions.h
>    lldb/trunk/include/lldb/Breapoint/Watchpoint.h
>    lldb/trunk/include/lldb/Breakpoint/Watchpointptions.h
>    lldb/trunk/inlude/lldb/Core/Debugger.h
>    lldb/trunk/include/lldb/Core/Event.h
>    lldb/tunk/include/lldb/Core/Module.h
>    lldb/trunk/include/lldb/Core/Timer.h
>    ldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h
>    lldb/trunk/include/lldb/DataFormatters/TypeSynthetic.h
>    lldb/trunk/include/lldb/Expresson/ClangExpression.h
>    lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
>   lldb/trunk/include/lldb/Expression/ClangExpressionParser.h
>    lldb/trunk/include/lldb/Expression/ClangFunction.h
>    lldb/trunk/include/lldb/Expression/ClangUserExpression.h
>   lldb/trunk/include/lldb/Expression/ClangUtilityFunction.h
>    lldb/trunk/include/lldb/Expression/IRDynamicChecks.h
>    lldb/trunk/include/lldb/Expression/IRExecutionUnit.h
>    lldb/trunk/include/lldb/Expression/IRForTarget.h
>    lldb/trunk/include/lldb/Host/Terminal.h
>    lldb/truk/include/lldb/Interpreter/CommandInterpreter.h
>    lldb/trunk/incude/lld/Interpreter/ScriptInterpreter.h
>    lldb/trunk/include/lldb/Interreter/ScriptInterpreterPython.h
>    lldb/trunk/include/lldb/SymbolClangASTContext.h
>    lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
>    lldb/trunk/include/lldb/Symbol/CompileUnit.h
>    lldb/trunk/include/lldb/Symbol/FuncUnwinders.h
>    lldb/trunk/include/lldb/Symbol/ObjectFile.h
>    lldb/trunk/include/lldb/Symbol/SymbolContext.h
>    lldb/trunk/include/lldb/Symbol/SymbolVendor.h
>    lldb/trunk/include/lldb/Target/Process.h
>    lldb/trunk/include/lldb/Target/StackFrameList.h
>    lldb/trunk/include/lldb/Taret/Target.h
>    lldb/trunk/include/lldb/Target/Thread.h
>    lldb/trunk/include/lldb/Target/ThreadPlanStepInRange.h
>    lldb/trunk/incude/lldb/Utility/PythonPointer.h
>    lldb/trunk/include/lldb/lldb-forward.h
>    lldb/trunk/scripts/Python/interface/SBExpressionOptions.i
>    lldb/trunk/scripts/Python/interface/SBSection.i
>    lldb/trunk/scripts/Python/interface/SBType.i
>    lldb/trunk/scripts/Python/python-wrapper.swig
>    lldb/trunk/source/Breakpont/BreakpointOptions.cpp
>    lldb/trunk/source/Breakpoint/WatchpointOption.cpp
>    lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp
>    lldb/trunk/source/Commands/CommandObjectCommands.cpp
>    lldb/trunk/source/Commands/CommandObjectTarget.cpp
>    lldb/trunk/source/Commands/CommandObjectWatchpointCommand.cpp
>    lldb/trunk/source/Core/Communication.cpp
>    lldb/trunk/source/Core/Disassembler.cpp
>    lldb/trunk/source/Core/DynamicLoader.cpp
>    lldb/trunk/source/Core/Module.cpp
>    ldb/trunk/source/Core/StreamAsynchronousIO.cpp
>    lldb/trunk/source/Expression/ClangxpressionDeclMap.cpp
>   lldb/trunk/source/Expression/ClangExpressionParser.cpp
>    lldb/trunk/source/Expression/ClangFunction.cpp
>    lldb/trunk/source/Expression/ClangUserExpression.cpp
>    lldb/trunk/source/Expression/ClangUtilityFunction.cpp
>    lldb/trunk/souce/Expression/DWARFExpression.cpp
>    lldb/trunk/source/Expression/IRExecutionUnit.cpp
>    lldb/trunk/source/Expression/IRInterpreer.cpp
>    lldb/trunk/source/Host/comon/File.cpp
>    lldb/trunk/source/Host/common/FileSpec.cpp
>    lldb/trunk/source/Hostcommon/Host.cpp
>    lldb/trunk/source/Host/freebsd/Host.cpp
>    lldb/trunk/source/Host/linux/Host.cpp
>    lldb/trunk/source/Interpreter/CommandInterpreter.cpp
>    lldb/runk/source/Interreter/Options.cpp
>    lldb/trunk/source/Interpreter/ScriptInterpreter.cpp
>    lldbtrunk/source/Interpreter/SciptInterpreterPython.cpp
>    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
>    lldbtrunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
>    
>lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.
>cpp
>    
>lldb/runk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.
>h
>    lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
>    
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untime.h
>    
>lldb/trunk/source/Plugins/LanuageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV1.cpp
>    
>lldb/trunk/source/Plugins/LanguaeRuntie/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV1.h
>    
>lldb/trunk/source/Plugins/anguageRuntime/ObjC/AppleObjCRutime/AppleObjCR
>untimeV2.cpp
>    
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppeObjCRuntime/AppleObjCR
>untimeV2.h>    
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCT
>rampolineHandler.h
>    
>lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDAr
>chive.cpp
>   
>lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainer
>UniversalMachO.cpp
>    lldb/trunk/source/Plugins/ObjetFile/ELF/ObjectFileELF.cpp
>    lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFilELF.h
>    lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
>    lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFileFF.cpp
>    
>lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDar
>winKernel.h
>    
>lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
>    
>lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
>    lldb/trunk/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
>    lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp
>    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
>    lldb/trunk/source/Plugins/Process/POSIX/POSIXThread.h
>    lldb/trunk/sorce/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
>    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h
>    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h
>    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
>    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
>    
>lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAsseblyInstE
>mulation.cpp
>    
>lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstE
>mulation.h
>    lldb/trunk/source/Symbol/FuncUnwinders.cpp
>    lldb/trunk/source/Symbol/LineTable.cpp
>    lldb/trunk/source/Symbol/ObjectFile.cpp
>    lldb/trunk/source/Symbol/SymbolFile.cpp
>    lldb/trunk/source/Symbol/SymbolVendor.cpp
>    lldb/trunk/source/Target/LanguageRuntime.cpp
>    lldb/trunk/source/Target/Memory.cpp
>    lldb/tunk/source/Target/OperatingSystem.cpp
>    lldb/trunk/source/Target/Platform.cpp
>    ldb/trunk/source/Target/Process.cpp
>    lldb/trunk/source/Target/StackFrameList.cpp
>    lldb/trunk/source/Target/Target.cpp
>    lldb/trunk/surce/Target/UnwindAssembly.cpp
>    lldb/trunk/tools/debugsever/source/DNBDefs.h
>    lldb/trunk/tools/debugserver/sorce/DNBTimer.h
>    lldb/trunk/tools/debugserver/sourc/MacOSX/MachThread.h
>    lldb/trunk/tools/driver/Driver.h
>    lldb/trunk/tools/lldb-platform/lldb-platfrm.cpp
>
>Modified: lldb/trunk/include/lldb/API/SBAddress.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBAddress.
>h?rev=179779&r=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/API/SBAddress.h (original)
>+++ lldb/trunk/include/lldb/API/SBAddress.h Thu Apr 18 13:10:51 2013
>@@ -141,7+141,7 @@ protected:
> 
> private:
> 
>    std::auto_ptr<lldb_private::Address> m_opaque_ap;>+    STD_UNIQUE_PTR(lldb_private::Address) m_opaqu_ap;
> };
> 
> 
>
>Modified: lldb/trunk/include/lldb/API/SBCommandReturnObject.h
>URL: 
>http://llvm.org/viewvc/lvm-project/lldb/trunk/include/lldb/API/SBCommandR
>eturnObject.h?rev=179779&r1=179778&2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/API/SBCommandReturnObject.h (original)
>+++ lldb/trunk/include/lldb/API/SBCommandReturnObject.h Thu Apr 18
>13:10:51 2013
>@@ -118,7 +118,7 @@ protected:
>     SetLLDBObjectPtr (lldb_private::CommandReturnObject *ptr);
> 
>  private:
>-    std::auto_ptr<lldb_private::CommandReturnObject> m_opaque_ap;
>+    STD_UNIQUE_PTR(lldb_private::CommandReturnObject) m_opaque_ap;
> };
>
> } // namespace lldb
>
>Modified: lldb/truk/include/lldb/API/SBDeclaration.h
>URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBDeclarat
>ion.h?rev=179779&r1=179778&r2=179779&iew=diff
>=========================================================================
>====
>--- lldb/trunk/include/lldb/API/SBDeclaration.h (original)
>+++ lldb/trun/include/lldb/API/SBDeclaration.h Thu Apr 18 13:10:51 2013
>@@ -0,7 +80,7 @@ namespace lldb {
>         void
>         SetDeclaration (const lldb_private::Declaration
>&lldb_object_ref);
>         
>-        std::auto_ptr<lldb_private::Declaration> m_opaque_ap;
>+        STD_UNIQUE_PTR(lldb_private::Declaration) m_opaque_ap;
>     };
>     
>     
>
>Modified: lldb/trunk/include/lldb/API/SBError.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBError.h?
>rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/API/SBEror.h (original)
>+++ lldb/trunk/include/lldb/API/SBError.h Thu Apr 18 13:10:51 2013
>@@ -93,7 +93,7 @@ protected:
>     Setrror const lldb_private::Error &lldb_error);
> 
> private:
>-    std::auto_ptr<lldb_private::Error> m_opaque_ap;
>+    STD_UNIQUE_PTR(lldb_private::Error) m_opaque_ap;
> 
>    void
>     CreateIfNeeded ();
>
>Modified: lldb/trunk/include/lldb/API/SBExpressionOptions.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBxpressi
>onOptions.h?rev=179779&r1=179778&r2=179779&vie=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/API/SBExprssionOptions.h (original)
>+++ lldb/trunk/include/lldb/API/SBExpressionOptions.h Thu Apr 18 13:10:51
>2013
>@@ -12,7 +12,6 @@
> 
> #include "lldb/API/SBDefines.h"
> 
>-#inclue <memory>
> #include <vector>
> 
> namespace lldb {
>@@ -82,7 +81,7 @@ protected:
> 
> private:
>     // This auto_pointer is made in the constructo and is always valid.
>-    mutable std::auto_ptr<lldb_private::EvaluateExpressionOptins>
>m_opaque_ap;
>+    mutable STD_UNIQUE_PR(lldb_private::EvaluateExpressionptions)
>m_opaque_ap;
> };
> 
> } // namespace lld
>
>Modified: lldb/trunk/include/lldb/API/SBFileSpec.h
>URL: 
>http://llv.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBFileSpec
>.h?rev=179779&r1=179778&r2=179779&view=iff
>==========================================================================
>====
>-- lldb/trunk/include/lldb/API/SBFileSpec.h (original)
>+++ lldb/trunk/include/lldb/API/SBFileSpec.h Thu Apr 18 13:10:51 2013
>@@ -84,7 +84,7 @@ private:
>     const lldb_private::FileSpec &
>     ref() const;
> 
>-    std::auto_ptr <lldb_private::FileSpec> m_opaque_ap;
>+    STD_UNIQUE_PTR(lldb_private::FileSpec) m_opaque_ap;
> };
> 
> 
>
>Modified: lldb/trunk/include/lldb/API/SBFileSpecList.h
>URL: 
>http://llvm.org/viewvc/llvmproject/lldb/trunk/include/lldb/API/SBFileSpec
>List.h?rev=179779&r1=179778&r2=179779&view=diff
>========================================================================
>====
>--- lldb/trunk/include/lldb/API/SBFileSpecList.h (original)
>+++ lldb/truk/include/lldb/API/SBFileSpecList.h Thu Apr 18 13:10:51 2013
>@@ -63,7 +63,7 @@ friend class SBTarget;
>     const lldb_private::FileSpecList &
>     ref() const;
> 
>-    std::auto_ptr <lldb_private::FileSpecList> m_opaque_ap;
>+    STD_UNIQUE_PTR(lldb_private::ileSpecList) m_opaque_ap;
> };
> 
> 
>
>Modified: lldb/trunk/include/lldb/API/SBLineEntry.h
>URL: 
>http://llvm.org/viewvc/llvm-proect/lldb/trunk/include/lldb/API/SBLineEntr
>y.h?rev=179779&r1=179778&r2=179779&view=diff
>=========================================================================>====
>--- lldb/trunk/include/lldb/API/SBLineEntry.h (original)
>+++ lldb/trunk/includelldb/API/SBLineEntry.h Thu Apr 18 13:10:51 2013
>@@ -90,7 +90,7 @@ private:
>     void
>     SetLineEntry (const lldb_private::LineEntry &lldb_object_ref);
> 
>-    std::auto_ptr<lldb_private::LineEntry> m_opaque_ap;
>+    STD_UNIQUEPTR(lldb_private::LineEntry) m_opaque_ap;
> };
> 
> 
>
>Modified: lldb/trunk/include/lldbAPI/SBSourceManager.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBSourceMa
>nager.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====>--- lldb/trunk/include/lldb/API/SBSourceManager.h (original)
>+++ lldb/trunk/includelldb/API/SBSourceManager.h Thu Apr 18 13:10:51 2013
>@@ -45,7 +45,7 @@ protected:
> 
> private:
> 
>-    std::uto_ptr<lldb_private::SourceManagerIrivate::SourceMaagerIpl) m_opaque_ap;
> };
> 
> } // namespace lldb
>
>Modified: lldb/trunk/include/lld/API/SBStream.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBStream.h
>?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>===
>--- lldb/trunk/include/lldb/API/SBStream.h (original)
>+++ lldb/trunk/include/lldb/API/SBStream. Thu Apr 18 13:10:51 2013
>@@ -100,7 +100,7 @@ protected:
> private:
> >     DISALLOW_COPY_AND_ASSIGN (SBStream);
>-    std::auto_ptr<lldb_private::Stream> m_opaque_ap
>+    STD_UNIQUE_PTR(lldb_private::Stream) m_opaque_ap;
>     bool m_i_file;
> };
> 
>
>Modified: lldb/trunk/include/lldb/API/SBStringList.h
>RL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBStringLi
>st.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/API/SBStrngList.h (original)
>+++ lldb/trunk/include/lldb/API/SBStringList.h Thu Apr 18 13:10:51 2013
>@@ -62,7 +62,7 @@ protected:
> 
> private:
> 
>-    std::auto_ptr<lldb_private::StringList> m_opaque_ap;
>+    STD_UNIQUE_PT(lldb_private::StringList) m_opaque_ap;
> 
> };
 
>
>Modified: lldb/trunk/include/lldb/API/SBSymbolContext.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBSymbolCo
>ntext.h?rev=179779&r1=179778&r2=179779&view=diff
>=========================================================================
>====
>--- lldb/trunk/include/lldb/API/SBSymbolContext.h (original)
>+++ lldb/trunk/inclde/lldb/API/SBSymbolContext.h Thu Apr 18 13:10:51 2013
>@@-85,7 +85,7 @@ protected:
>     SetSymbolContext (const lldb_rivate::SymbolContext *sc_ptr);
> 
> private:
>-    std::auto_ptr<lldb_private::SymbolContext> m_opaque_ap
>+    STD_UNIQUE_PTR(lldb_private::SymbolContext) m_opaque_ap;
> };
> 
> 
>
>Modified: lldb/runk/include/lldb/API/SBSymbolContextList.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBSymbolCo
>ntextList.h?rev=17779&r1=179778&r2=179779&view=diff
>=========================================================================
>====
>--- lldb/trunk/include/llb/API/SBSymbolContextList.h (original)
>+++ lldb/trunk/include/lldb/API/SBSymbolContextList.h Thu Apr 18 13:10:51
>2013
>@@ -60,7 +60,7 @@ protected:
>     operator*() const;
> 
> private:
>-    std::auto_ptr<lldb_private::SymbolContxtList> m_opaque_ap;
>+    STD_UNIQUE_PTR(lldb_private::SymbolContextList) m_opaque_ap;
> };
> 
> 
>
>Modified: lldb/trunk/include/lldb/API/SBType.h
>URL: 
>http://llvm.org/iewvc/llv-project/lldb/trunk/include/lldb/API/SBType.h?r
>ev=17979&r1=179778&r2=179779&view=diff
>=====================================================================riginal)
>+++ lldb/trunk/include/lldb/API/SBType.h Thu Apr 18 13:10:51 2013
>@@ -65,7 +65,7 @@ protected:
>     const lldb_private::TypeMemberImpl &
>     ref () const;
> 
>-    std::auto_ptr<lldb_private::TypeMemberImpl> m_opaque_ap;
>+    STD_UNIQUE_PTR(lldb_private::TypeMemberImpl) m_opaque_ap;
> };
> 
> class SBType
>@@ -234,7 +234,7 @@ public:
>     
>     
> private:
>-    std:auto_ptr<lldb_private::TypeListImpl> m_opaque_ap;
>+    ST_UNIQUE_PTR(lldb_pridified: lldb/trunk/include/lldb/Breakpoint/BreakpointLocation.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Bre
>akointLocation.h?rev=179779&r1=179778&r2=179779&view=diff
>=========================================================================
>====
>--- lldb/truk/include/lldb/Breakpoint/BreakpointLocation.h (original)
>+++ lldb/trunk/include/lldb/Breakpoint/BreakpointLocation.h Thu Apr 18
>13:10:51 2013
>@@ -14,7 +146 @@
> 
> // C++ Includes
> #include <list>
>-#include <memory>
> 
 // Other libraries and framework includes
> 
>@@ -380,7 +379,7 @@ private:
>     bool m_being_created;
>     Address m_address; ///< The address defining this location.
>     Breakpoint &m_owner; ///< The breakpoint that produced this objct.
>-    std::auto_ptr<BreakpointOptions> m_options_ap; ///< Breakoint
>options pointer, NULL if we're using our breakpoint's options.
>+    STD_UNIQUE_PTR(BreakpointOptions) m_options_ap; ///< Breakpoint
>options ponter, NULL if we're using our breakpoint's options.
>     lldb::BreakpointSiteSP m_bp_site_sp; ///< Our breakpoint site (it
>may be shared by more than one location.)
> 
>     void

>Modified: lldb/trunk/includ/lldb/Breakpoint/BreakpointOptions.h
>URL: 
>http://llvm.org/viewvcllvm-project/lldb/trunk/include/lldb/Breakpoint/Bre
>akpointOptions.h?rev=179779&r1=179778&r2=179779&view=diff
>=========================================================================
>====
>--- lldb/trunk/include/lldb/Brakpoint/BreakpointOptions.h (original)
>+++ lldb/trunk/include/lldb/Breakpoint/BreakpointOptions.h Thu Apr 18
>13:10:51 2013
>@@ -12,7 +12,6 @@
> 
> // C Includes
> // C++ Includes
>-#include <memory>
> // Other libraries and framework includes
> // Project includes
> #include "ldb/lldb-private.h"
>@@ -349,8 +348,8 @@ private:
>     boo2_t m_ignore_count; // Number of times to ignore thishread_spec_ap; // Thread for which this
>breakpression> m_condition_ap;  // The condition
>to test.
>+    STD_UNIQUE_PTRich
>this breakpoint will take
>+    STD_UNIQUThe
>condition to test.
> 
> };
> 
>
>Modified: lldb/trunk/include/lldb/Breakpoint/Wathpoint.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/incude/lldb/BreakpointWat
>chpoint.h?rev=179779&r1=179778&r2=============================================
>====
>-.h (original)
>+++ lldb/trunk/include/lldb/Brea@ -234,7 +234,7 @@ private:
>                                        // t_created;
> 
>-    std::auto_ptr<ClangUserExprst.
>+    STD_UNIQUE_PTR(ClangUserExpression) m_condition_ap;  // The
>condition to test.
> 
>     void SetID(lldb::wach_id_t id) { m_loc_id = id; }
>     
>
>Modified: lldb/trunk/include/lldb/Breakpoint/WathpointOptions.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Wat
>chpontOptions.h?rev=179779&r1=179778&r2=179779&view=diff
>===============================================
>====
>--- lldb/trunk/include/lldb/Breakpoint/WatchpointOptitrunk/include/lldb/Breakpoint/WatchpointOptions.h Thu Apr 18
>13:10:51 2013
>@@ -12,7 +12,6 @@
> 
> // C Includes
> // C++ Includes
>-#include <memory>
> // Other libraries and framework includes
> // Project includes
> .h"
>@@ -248,7 +247,7 @@ private:
>     WatchpointHitCallback m_callback; // This is the callback function
>pointer
>     lldb::BatonSP m_callback_baton_sp; // This is the client data for
>the callback
     bool m_callback_is_synchronous;
>-    std::auto_ptr<ThreadSpec> m_thread_spec_ap; // Thread for which this
>watchpoint will take
>+    STD_UNIQUE_PTR(ThreadSpec) m_thread_spec_ap; // Thread for which
>this watchpoint will take
> };> 
> } // namespace lldb_private
>
>Modified: lldb/trunk/include/lldb/Core/Debuggerh
>UR: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Debugger.
>h?rev=179779&r1=19778&r2=179779&view=diff
>=========================================================================
>====
>--- lldb/trunk/include/lldb/Core/Debugger.h (original)
>+++ lldb/trunk/include/lldb/Core/Debugger.h Thu Apr 18 13:10:51 2013
>@@ -359,10 +35ted:
>     TargetList m_target_list;
>     PlatformList m_platform_list;
>     Listener m_listener;
>-    std::auto_ptr<SourceManager> m_source_manager_ap;    // This is a
>scratch source manager that we return if we have no targets.
>+    STD_UNIQUE_PTR(SourceManage) m_source_manager_ap;    // This is a
>scratch source manager that we retrn if we have no targets.
>     SourceManager::SourceFileCahe m_source_file_cache; // All the
>source managers for targets created in this debugger used this shared
>                                                         // source file
>cache.
>-    std::auto_ptr<CommandInterpreter> m_command_interpreter_ap;
>+    STD_UNIQUE_PTR(CommandInterpreter) m_command_interpreter_ap;
> 
>     InputReaderStack m_input_reader_stack;
>     std::string m_input_reader_data;
>
>Modified: lldb/trunk/include/lldb/Core/Event.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Event.h?r
>ev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Core/Event.h (original)
>+++ lldb/trunk/include/lldb/Cor/Event.h Thu Apr 18 13:10:51 2013
>@@ 205,7 +205,7 @@ private:
> 
>     Broadcaster *   m_broadcaster;  // The boadcaster that sent this
>event
>     uint32_t        m_type;        // The bit describing this eent
>-    std::auto_ptr<EventData> m_data_ap         // Userspecific data
>for this event
>+    STD_UNIQUE_PTR(EventData) m_data_ap;        // User specific data
>for this event
> 
> 
>     DISALLOW_CPY_AN_ASSIGN (Event);
>
>Modified: lldb/trunk/include/lldb/Core/Module.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Module.h?
>rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Core/Module.h (original)
>+++ lldb/trunk/include/lldb/Core/Module.h Thu Apr 18 13:10:51 2013
>@@ -526,12 +526,7 @@ public:
>     }
>     
>     void
>-    SetSymbolFileFileSpec (const FileSpec &ile)
>-    {
>-        m_symfile_spec = file;
>-        m_symfile_ap.reset();
>-        m_did_load_symbol_vendor = false;
>-    }
>+    SetSymbolFileFileSpec (const FileSpec &file);
> 
>     const TimeValue &
>    GetModificationTime () const;
>@@ -946,7 +941,7 @@ protected:
>     ConstString                 m_object_name;  ///< The name an object
>witn this module that is selected, or empty of the module is
>represented by \a m_ile.
>     uint64_t                    m_object_offst;
>     lldb::ObjectFileSP          m_objfile_sp;   ///< A shared pointer to
>the object file parser for this module as it may or may not be shared
>with the SymbolFile
>-    std::auto_ptr<SymbolVendor> m_symfile_ap;   ///< A pointer to the
>symbol vendor for this module.
>    STD_UNIQUE_PTR(SymbolVendor) m_symfile_ap;   ///< A pointer to the
>symbol vendor for this module.
>     ClangASTContext             m_ast;          ///< The AST context for
>this module.
>     PathMappingList             m_source_mappings; ///< Module specific
>soure remappings for when you have debug inf for a module that dfied: lldb/trunk/include/lldb/Core/Timer.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldbtrunk/nclude/lldb/Core/Timer.h?r
>ev=179779&r1=179778&r2=17=================================
>====
>--- lldb/trunk/include/lldb/Core/Timer.h (original)
>+++ llb/trunk/inclde/lldb/Core/Timer.h Thu Apr 18 13:10:51 2013
>@@ -13,7 +13,6 @@
> 
> #include <stdarg.h>
> #include <stdio.h>
>-#include <memory>
> #include <string
> #include "lldb/lldb-private.h"
> #include "lldb/Host/TimeValue.h"
>
>Modified: lldb/tunk/include/lldb/Core/ValueObjectSyntheticFilter.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObje
>ctSyntheticFilter.h?re=179779&r1=179778&r2=179779&view=diff
>=========================================================================
>====
>--- lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h (original)
>+++ lldb/trunk/include/lldb/Cre/ValueObjectSyntheticFiter.h Thu Apr 18
>13:10:51 2013
>@@ -151,7 +151,7 @@ protected:
> 
>     // we eed to hold on to the SyntheticChildren because someon might
>delete the tpe binding while we are alive
>     lldb::SyntheticChildreSP m_synth_sp;
>-    std::auto_ptr<SyntheticChildrenFrontEnd> m_synth_filter_ap;
>+    STD_UNIQUE_PTR(SntheticChildrenFrontEnd) m_synth_filter_ap;
>     
>     typedef std::map<uint32_t, ValuObjec*> ByIndexMap;
>     typedef std::map<const char*, uint32_t> NameToIndexMap;
>
>Modified: lldb/trunk/include/lldb/DataFormatters/TypeSynthetic.h
>URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters
>/TypeSynthetic.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/DatFormatters/TypeSynthetic.h (original)
>+++ lldb/trunk/include/lldb/DataFormattes/TypeSynthetic.h Thu Apr 18
>13:10:51 2013
>@@ -69,7 +69,7 @@ namespace ldb_private {
>         MightHaveChildren () = 0;
>         
>         typedef STD_SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
>-       typedef std::autoptr<SyntheticChildrenFrontEnd> AutoPointer;
>+        typedef STD_UNIQUE_PTR(SyntheticChldrenFrontEnd) AutoPointer;
>        
>     private:
>         DISALLOW_COPY_AND_ASSIGN(SyntheticChildrenFrontEnd);
>
>Modified: lldb/trunk/include/ldb/Expresion/ClangExpression.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lld/Expression/Cla
>ngExpression.h?rev=179779&r1=179778&r2=179779&view=diff
>=========================================================================
>====
>--- ldb/trunk/include/lldb/Expression/ClanExpression.h (original)
>+++ lldb/trunk/iclude/lldb/Expression/ClangExpression.h Thu Apr 18
>13:10:51 2013
>@@ -1,7+14,6 @@
> // C++ Includes
> #include <string>
> #include <map>
>-#include <memory>
> #include <vector>
> 
> // Other libraries and framework includes
>
>Modifie: lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
>URL: 
>http://llvm.org/viwvc/llvm-project/lldb/trunk/include/lldb/Expression/Cla
>ngExpressionDeclMap.h?rev=179779&r1=179778&r2=179779&view=diff
>=========================================================================
>====
>--- lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h (original)
>+++ lldb/trunk/include/lldb/Expression/ClangExpressionDeclMapApr
>18 13:10:51 2013
>@@ -714,7 +714,7 @@ private:
>         DISALLOW_COPY_AND_ASSIGN (ParserVars);
>     };
>     
>-    std::auto_ptr<ParserVars> m_parser_vars;
>+    STD_UNIQUE_PTR(ParserVars) m_parservars;
>     
>     
>//---------------------------------------------------------------
>     /// Activate parser-specific variables
>@@ -756,7 +756,7 @@ private:
>         TypeFromUser                m_object_pointer_type;      ///< The
>type of the "this" variable, if one exists
>     };
>     
>-    std::auto_ptrStructVars> m_struct_vars;
>+    STD_UNIQUE_PTR(StructVars) m_struct_vars;
>     
>     
>//----------------------------------------------------------------------
>     /// Activate struct variables
>@@ -795,7 +795,7 @@ private:
>         lldb::addr_t                m_materialized_location;    ///< The
>address at which the struct is placed.  Falls inside the allocated area.
>     };
>     
>-    std::auto_ptr<MaterialVars> m_material_vars;
>+    STD_UNIQUE_PTR(Materialars) m_material_vars;
>     
>     
>//----------------------------------------------------------------------
>     /// Activate materialization-specific variable
>
>Moified: lldb/trunk/include/lldb/xpression/ClangExpressionParser.h
>URL: 
>http://llvm.org/viewvc/llvm-poject/lldb/trunk/includ/lldb/Expression/Cla
>ngExpressionParser.h?rev=179779&r1=179778&r2179779&view=diff
>=========================================================================
>====
>--- lldb/trunk/include/lldb/Expression/ClangExpressionParser.h (original)
>+++ ldb/trunk/include/lldb/Expression/ClangExpressionParser.h Thu Apr 18
>13:1:51 2013
>@@ -86,7 +86,7 @@ public:
>     ///
>     /// @param[in]ion_unit_ap
>     ///     After parsing, ownership of the execution unit for
>-    ///     for the expresion is handed to this auto_ptr.
>+    ///     for the expression is handed to this unique pointer.
>     ///
>     /// @param[in] exe_ctx
>     ///     The execution context o write the function into.
>@@ -112,7 +112,7 @@ public:
>     Error
>     PepareForExecution (lldb::addr_t &funcaddr,
>                         lldb::addr_t &func_end,
>-                        std::auto_ptr<IRExecutionUnit>
>&execution_unit_ap,
>+                         STD_UNIUE_PTR(IRExecutionUnit)
>&execution_unit_ap,
>                          ExcutionContext &exe_ctx,
>                         bool &evaluated_statically,
>                          lld::ClangExpressionVariableSP &const_result,
>@@ -136,16 +136,15 @@ public:
                          ExecutionContet &exe_ctx);
>     
> privClangExpression                           &m_expr;
>///< The expression to be parsed
>-    
>-    std::auto_ptrlvm::LLVMContext>            m_llvm_context;
>///< The LLVM context to generate IR into
>    std::auto_ptr<clang::FileManager>           m_file_manager;
>///< The Clang file manager object used by the compiler
>-    std::auto_ptr<clang::ompilerInstance>      m_compiler;
>///< The Clang compiler used to parse xpressions into IR
>-    std::auto_ptr<clang::Builtin::Context>      m_builtin_cotext;      
>///< Context for Clang built-ins
>-    std::auto_ptr<clang::SlectorTable>         m_selector_table;       
>///< Selector table for Objective-C methods
>-    std:auto_ptr<clang::ASTContext>            m_ast_context;          
>///< TheAST context used to hold types and names for the parser
>-    std::auto_ptr<clang::CodeGenerator>         m_code_generator;       
>///< The Clan object that generates IR
>-    std::auto_ptr<IRExecutionUnit>              m_execution_unit;       
>///< The container for the finished Module
>+    ClangExpression &                       m_expr;                 ///< 
>The exprssion to be parsd
>+    STD_UNIQUE_PTR(llvm::LLVMContext)       m_llvm_context;        ///< 
>The LLVM context to generate IR into
>+    STD_UNIQUE_PTR(clang::FileManager)      m_file_manager;        ///< 
>The Claer
>+    STD_UNIQUE_PT(clang::CompilerInstance) m_compiler;             ///< 
>The Clang compiler used to parse expressions into IR
>+    STD_UNIQUE_PTR(clang::Builtin::Context) m_builtin_context;      ///< 
>Context for Clang built-ins
>+    STD_UNIQUE_PTR(clang::SelectorTable)    m_selector_table;       ///< 
>Selector table for Objective-C methods
>+    STD_UNIQUE_PTR(clang::ASTContext)       m_ast_context;          ///< 
>The AST context used to hold types and names for the parser
>+    STD_UNIQUE_PTR(clang::CodeGenerator)    m_code_generator;       ///< 
>The Clang object that generates IR
>+    STD_UNIQUE_PTR(IRExecutionUnit)         m_execution_unit;       ///< 
>The container for the finished Module
> };
>     
> }
>
>Modified: lldb/trunk/include/lldb/Expression/ClangFunction.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/Cla
>ngFunction.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Expression/ClangFunction.h (original)
>+++ lldb/trunk/include/lldb/Expression/ClangFunction.h Thu Apr 18 
>13:10:51 2013
>@@ -619,8 +619,8 @@ private:
> 	// For ClangFunction only
> 	//------------------------------------------------------------------
> 
>-    std::auto_ptr<ClangExpressionParser>    m_parser;               ///< 
>The parser responsible for compiling the function.
>-    std::auto_ptr<IRExecutionUnit>          m_execution_unit_ap;
>+    STD_UNIQUE_PTR(ClangExpressionParser) m_parser;                 ///< 
>The parser responsible for compiling the function.
>+    STD_UNIQUE_PTR(IRExecutionUnit) m_execution_unit_ap;
>     
>     Function                       *m_function_ptr;                 ///< 
>The function we're going to call.  May be NULL if we don't have debug 
>info for the function.
>     Address                         m_function_addr;                ///< 
>If we don't have the FunctionSP, we at least need the address & return 
>type.
>
>Modified: lldb/trunk/include/lldb/Expression/ClangUserExpression.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/Cla
>ngUserExpression.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Expression/ClangUserExpression.h (original)
>+++ lldb/trunk/include/lldb/Expression/ClangUserExpression.h Thu Apr 18 
>13:10:51 2013
>@@ -14,7 +14,6 @@
> // C++ Includes
> #include <string>
> #include <map>
>-#include <memory>
> #include <vector>
> 
> // Other libraries and framework includes
>@@ -420,12 +419,10 @@ private:
>     std::string                                 m_transformed_text;     
>///< The text of the expression, as send to the parser
>     ResultType                                  m_desired_type;         
>///< The type to coerce the expression's result to.  If eResultTypeAny, 
>inferred from the expression.
>     
>-    std::auto_ptr<ClangExpressionDeclMap>       m_expr_decl_map;        
>///< The map to use when parsing the expression.
>-    
>-    std::auto_ptr<IRExecutionUnit>              m_execution_unit_ap;    
>///< The execution unit the expression is stored in.
>-    std::auto_ptr<Materializer>                 m_materializer_ap;      
>///< The materializer to use when running the expression.
>-    
>-    std::auto_ptr<ASTResultSynthesizer>         m_result_synthesizer;   
>///< The result synthesizer, if one is needed.
>+    STD_UNIQUE_PTR(ClangExpressionDeclMap)      m_expr_decl_map;        
>///< The map to use when parsing the expression.
>+    STD_UNIQUE_PTR(IRExecutionUnit)             m_execution_unit_ap;    
>///< The execution unit the expression is stored in.
>+    STD_UNIQUE_PTR(Materializer)                m_materializer_ap;      
>///< The materializer to use when running the expression.
>+    STD_UNIQUE_PTR(ASTResultSynthesizer)        m_result_synthesizer;   
>///< The result synthesizer, if one is needed.
>     
>     bool                                        m_enforce_valid_object; 
>///< True if the expression parser should enforce the presence of a valid 
>class pointer in order to generate the expression as a method.
>     bool                                        m_cplusplus;            
>///< True if the expression is compiled as a C++ member function (true if 
>it was parsed when exe_ctx was in a C++ method).
>
>Modified: lldb/trunk/include/lldb/Expression/ClangUtilityFunction.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/Cla
>ngUtilityFunction.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Expression/ClangUtilityFunction.h (original)
>+++ lldb/trunk/include/lldb/Expression/ClangUtilityFunction.h Thu Apr 18 
>13:10:51 2013
>@@ -14,7 +14,6 @@
> // C++ Includes
> #include <string>
> #include <map>
>-#include <memory>
> #include <vector>
> 
> // Other libraries and framework includes
>@@ -168,8 +167,8 @@ public:
>     }
>     
> private:
>-    std::auto_ptr<ClangExpressionDeclMap>   m_expr_decl_map;    ///< The 
>map to use when parsing and materializing the expression.
>-    std::auto_ptr<IRExecutionUnit>          m_execution_unit_ap;
>+    STD_UNIQUE_PTR(ClangExpressionDeclMap)  m_expr_decl_map;    ///< The 
>map to use when parsing and materializing the expression.
>+    STD_UNIQUE_PTR(IRExecutionUnit)         m_execution_unit_ap;
>     
>     std::string                             m_function_text;    ///< The 
>text of the function.  Must be a well-formed translation unit.
>     std::string                             m_function_name;    ///< The 
>name of the function.
>
>Modified: lldb/trunk/include/lldb/Expression/IRDynamicChecks.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRD
>ynamicChecks.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Expression/IRDynamicChecks.h (original)
>+++ lldb/trunk/include/lldb/Expression/IRDynamicChecks.h Thu Apr 18 
>13:10:51 2013
>@@ -77,8 +77,8 @@ public:
>     
>     bool DoCheckersExplainStop (lldb::addr_t addr, Stream &message);
>     
>-    std::auto_ptr<ClangUtilityFunction> m_valid_pointer_check;
>-    std::auto_ptr<ClangUtilityFunction> m_objc_object_check;
>+    STD_UNIQUE_PTR(ClangUtilityFunction) m_valid_pointer_check;
>+    STD_UNIQUE_PTR(ClangUtilityFunction) m_objc_object_check;
> };
> 
> //----------------------------------------------------------------------
>
>Modified: lldb/trunk/include/lldb/Expression/IRExecutionUnit.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRE
>xecutionUnit.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Expression/IRExecutionUnit.h (original)
>+++ lldb/trunk/include/lldb/Expression/IRExecutionUnit.h Thu Apr 18 
>13:10:51 2013
>@@ -66,8 +66,8 @@ public:
>     //------------------------------------------------------------------
>     /// Constructor
>     //------------------------------------------------------------------
>-    IRExecutionUnit (std::auto_ptr<llvm::LLVMContext> &context_ap,
>-                     std::auto_ptr<llvm::Module> &module_ap,
>+    IRExecutionUnit (STD_UNIQUE_PTR(llvm::LLVMContext) &context_ap,
>+                     STD_UNIQUE_PTR(llvm::Module) &module_ap,
>                      ConstString &name,
>                      const lldb::TargetSP &target_sp,
>                      std::vector<std::string> &cpu_features);
>@@ -422,7 +422,7 @@ private:
>             return m_default_mm_ap->getPointerToNamedFunction(Name, 
>AbortOnFailure);
>         }
>     private:
>-        std::auto_ptr<JITMemoryManager>     m_default_mm_ap;    ///< The 
>memory allocator to use in actually creating space.  All calls are passed 
>through to it.
>+        STD_UNIQUE_PTR(JITMemoryManager)    m_default_mm_ap;    ///< The 
>memory allocator to use in actually creating space.  All calls are passed 
>through to it.
>         IRExecutionUnit                    &m_parent;           ///< The 
>execution unit this is a proxy for.
>     };
>     
>@@ -502,9 +502,9 @@ private:
>     typedef std::vector<AllocationRecord>   RecordVector;
>     RecordVector                            m_records;
> 
>-    std::auto_ptr<llvm::LLVMContext>        m_context_ap;
>-    std::auto_ptr<llvm::ExecutionEngine>    m_execution_engine_ap;
>-    std::auto_ptr<llvm::Module>             m_module_ap;            ///< 
>Holder for the module until it's been handed off
>+    STD_UNIQUE_PTR(llvm::LLVMContext)       m_context_ap;
>+    STD_UNIQUE_PTR(llvm::ExecutionEngine)   m_execution_engine_ap;
>+    STD_UNIQUE_PTR(llvm::Module)            m_module_ap;            ///< 
>Holder for the module until it's been handed off
>     llvm::Module                           *m_module;               ///< 
>Owned by the execution engine
>     std::vector<std::string>                m_cpu_features;
>     llvm::SmallVector<JittedFunction, 1>    m_jitted_functions;     ///< 
>A vector of all functions that have been JITted into machine code
>
>Modified: lldb/trunk/include/lldb/Expression/IRForTarget.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/IRF
>orTarget.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Expression/IRForTarget.h (original)
>+++ lldb/trunk/include/lldb/Expression/IRForTarget.h Thu Apr 18 13:10:51 
>2013
>@@ -670,7 +670,7 @@ private:
>     lldb_private::ConstString               m_result_name;              
>///< The name of the result variable ($0, $1, ...)
>     lldb_private::TypeFromParser            m_result_type;              
>///< The type of the result variable.
>     llvm::Module                           *m_module;                   
>///< The module being processed, or NULL if that has not been determined 
>yet.
>-    std::auto_ptr<llvm::DataLayout>         m_target_data;              
>///< The target data for the module being processed, or NULL if there is 
>no module.
>+    STD_UNIQUE_PTR(llvm::DataLayout)        m_target_data;              
>///< The target data for the module being processed, or NULL if there is 
>no module.
>     lldb_private::ClangExpressionDeclMap   *m_decl_map;                 
>///< The DeclMap containing the Decls 
>     StaticDataAllocator                     m_data_allocator;           
>///< The allocator to use for constant strings
>     lldb_private::IRMemoryMap              &m_memory_map;               
>///< The memory map to pass to the IR interpreter
>
>Modified: lldb/trunk/include/lldb/Host/Terminal.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/Terminal.
>h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Host/Terminal.h (original)
>+++ lldb/trunk/include/lldb/Host/Terminal.h Thu Apr 18 13:10:51 2013
>@@ -173,7 +173,7 @@ protected:
>     //------------------------------------------------------------------
>     Terminal        m_tty;          ///< A terminal
>     int             m_tflags;       ///< Cached tflags information.
>-    std::auto_ptr<struct termios> m_termios_ap; ///< Cached terminal 
>state information.
>+    STD_UNIQUE_PTR(struct termios) m_termios_ap; ///< Cached terminal 
>state information.
>     lldb::pid_t     m_process_group;///< Cached process group 
>information.
> 
> };
>
>Modified: lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/Co
>mmandInterpreter.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h (original)
>+++ lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h Thu Apr 18 
>13:10:51 2013
>@@ -463,7 +463,7 @@ private:
>     OptionArgMap m_alias_options;               // Stores any options 
>(with or without arguments) that go with any alias.
>     std::vector<std::string> m_command_history;
>     std::string m_repeat_command;               // Stores the command 
>that will be executed for an empty command string.
>-    std::auto_ptr<ScriptInterpreter> m_script_interpreter_ap;
>+    STD_UNIQUE_PTR(ScriptInterpreter) m_script_interpreter_ap;
>     char m_comment_char;
>     char m_repeat_char;
>     bool m_batch_command_mode;
>
>Modified: lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/Sc
>riptInterpreter.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h (original)
>+++ lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h Thu Apr 18 
>13:10:51 2013
>@@ -425,7 +425,7 @@ public:
>         return lldb::ScriptInterpreterObjectSP(new 
>ScriptInterpreterObject(object));
>     }
>     
>-    virtual std::auto_ptr<ScriptInterpreterLocker>
>+    virtual STD_UNIQUE_PTR(ScriptInterpreterLocker)
>     AcquireInterpreterLock ();
>     
>     const char *
>
>Modified: lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/Sc
>riptInterpreterPython.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h 
>(original)
>+++ lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h Thu Apr 
>18 13:10:51 2013
>@@ -181,7 +181,7 @@ public:
>     virtual lldb::ScriptInterpreterObjectSP
>     MakeScriptObject (void* object);
>     
>-    virtual std::auto_ptr<ScriptInterpreterLocker>
>+    virtual STD_UNIQUE_PTR(ScriptInterpreterLocker)
>     AcquireInterpreterLock ();
>     
>     void
>
>Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangAS
>TContext.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original)
>+++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Thu Apr 18 13:10:51 
>2013
>@@ -11,11 +11,11 @@
> #define liblldb_ClangASTContext_h_
> 
> // C Includes
>+#include <stdint.h>
>+
> // C++ Includes
> #include <string>
> #include <vector>
>-#include <memory>
>-#include <stdint.h>
> 
> // Other libraries and framework includes
> #include "llvm/ADT/OwningPtr.h"
>@@ -1013,22 +1013,22 @@ protected:
>     //------------------------------------------------------------------
>     // Classes that inherit from ClangASTContext can see and modify these
>     //------------------------------------------------------------------
>-    std::string                             m_target_triple;
>-    std::auto_ptr<clang::ASTContext>        m_ast_ap;
>-    std::auto_ptr<clang::LangOptions>       m_language_options_ap;
>-    std::auto_ptr<clang::FileManager>       m_file_manager_ap;
>-    std::auto_ptr<clang::FileSystemOptions> m_file_system_options_ap;
>-    std::auto_ptr<clang::SourceManager>     m_source_manager_ap;
>-    std::auto_ptr<clang::DiagnosticsEngine>  m_diagnostics_engine_ap;
>-    std::auto_ptr<clang::DiagnosticConsumer> m_diagnostic_consumer_ap;
>+    std::string                                     m_target_triple;
>+    STD_UNIQUE_PTR(clang::ASTContext)               m_ast_ap;
>+    STD_UNIQUE_PTR(clang::LangOptions)              
>m_language_options_ap;
>+    STD_UNIQUE_PTR(clang::FileManager)              m_file_manager_ap;
>+    STD_UNIQUE_PTR(clang::FileSystemOptions)        
>m_file_system_options_ap;
>+    STD_UNIQUE_PTR(clang::SourceManager)            m_source_manager_ap;
>+    STD_UNIQUE_PTR(clang::DiagnosticsEngine)        
>m_diagnostics_engine_ap;
>+    STD_UNIQUE_PTR(clang::DiagnosticConsumer)       
>m_diagnostic_consumer_ap;
>     llvm::IntrusiveRefCntPtr<clang::TargetOptions>  m_target_options_rp;
>-    std::auto_ptr<clang::TargetInfo>        m_target_info_ap;
>-    std::auto_ptr<clang::IdentifierTable>   m_identifier_table_ap;
>-    std::auto_ptr<clang::SelectorTable>     m_selector_table_ap;
>-    std::auto_ptr<clang::Builtin::Context>  m_builtins_ap;
>-    CompleteTagDeclCallback                 m_callback_tag_decl;
>-    CompleteObjCInterfaceDeclCallback       m_callback_objc_decl;
>-    void *                                  m_callback_baton;
>+    STD_UNIQUE_PTR(clang::TargetInfo)               m_target_info_ap;
>+    STD_UNIQUE_PTR(clang::IdentifierTable)          
>m_identifier_table_ap;
>+    STD_UNIQUE_PTR(clang::SelectorTable)            m_selector_table_ap;
>+    STD_UNIQUE_PTR(clang::Builtin::Context)         m_builtins_ap;
>+    CompleteTagDeclCallback                         m_callback_tag_decl;
>+    CompleteObjCInterfaceDeclCallback               m_callback_objc_decl;
>+    void *                                          m_callback_baton;
> private:
>     //------------------------------------------------------------------
>     // For ClangASTContext only
>
>Modified: lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangEx
>ternalASTSourceCallbacks.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h 
>(original)
>+++ lldb/trunk/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h Thu 
>Apr 18 13:10:51 2013
>@@ -14,7 +14,6 @@
> // C++ Includes
> #include <string>
> #include <vector>
>-#include <memory>
> #include <stdint.h>
> 
> // Other libraries and framework includes
>
>Modified: lldb/trunk/include/lldb/Symbol/CompileUnit.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Compile
>Unit.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Symbol/CompileUnit.h (original)
>+++ lldb/trunk/include/lldb/Symbol/CompileUnit.h Thu Apr 18 13:10:51 2013
>@@ -401,7 +401,7 @@ protected:
>     std::vector<lldb::FunctionSP> m_functions; ///< The sparsely 
>populated list of shared pointers to functions
>                                          ///< that gets populated as 
>functions get partially parsed.
>     FileSpecList m_support_files; ///< Files associated with this 
>compile unit's line table and declarations.
>-    std::auto_ptr<LineTable> m_line_table_ap; ///< Line table that will 
>get parsed on demand.
>+    STD_UNIQUE_PTR(LineTable) m_line_table_ap; ///< Line table that will 
>get parsed on demand.
>     lldb::VariableListSP m_variables; ///< Global and static variable 
>list that will get parsed on demand.
> 
> private:
>
>Modified: lldb/trunk/include/lldb/Symbol/FuncUnwinders.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/FuncUnw
>inders.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Symbol/FuncUnwinders.h (original)
>+++ lldb/trunk/include/lldb/Symbol/FuncUnwinders.h Thu Apr 18 13:10:51 
>2013
>@@ -1,9 +1,6 @@
> #ifndef liblldb_FuncUnwinders_h
> #define liblldb_FuncUnwinders_h
> 
>-
>-#include <memory>
>-
> #include "lldb/Core/AddressRange.h"
> #include "lldb/Core/ArchSpec.h"
> #include "lldb/Core/AddressRange.h"
>
>Modified: lldb/trunk/include/lldb/Symbol/ObjectFile.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ObjectF
>ile.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Symbol/ObjectFile.h (original)
>+++ lldb/trunk/include/lldb/Symbol/ObjectFile.h Thu Apr 18 13:10:51 2013
>@@ -621,8 +621,8 @@ protected:
>     lldb_private::UnwindTable m_unwind_table; /// < Table of 
>FuncUnwinders objects created for this ObjectFile's functions
>     lldb::ProcessWP m_process_wp;
>     const lldb::addr_t m_memory_addr;
>-    std::auto_ptr<lldb_private::SectionList> m_sections_ap;
>-    std::auto_ptr<lldb_private::Symtab> m_symtab_ap;
>+    STD_UNIQUE_PTR(lldb_private::SectionList) m_sections_ap;
>+    STD_UNIQUE_PTR(lldb_private::Symtab) m_symtab_ap;
>     
>     //------------------------------------------------------------------
>     /// Sets the architecture for a module.  At present the architecture
>
>Modified: lldb/trunk/include/lldb/Symbol/SymbolContext.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/SymbolC
>ontext.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Symbol/SymbolContext.h (original)
>+++ lldb/trunk/include/lldb/Symbol/SymbolContext.h Thu Apr 18 13:10:51 
>2013
>@@ -367,12 +367,12 @@ private:
>     lldb::TargetSP                 m_target_sp;
>     std::string                    m_module_spec;
>     lldb::ModuleSP                 m_module_sp;
>-    std::auto_ptr<FileSpec>        m_file_spec_ap;
>+    STD_UNIQUE_PTR(FileSpec)       m_file_spec_ap;
>     size_t                         m_start_line;
>     size_t                         m_end_line;
>     std::string                    m_function_spec;
>     std::string                    m_class_name;
>-    std::auto_ptr<AddressRange>    m_address_range_ap;
>+    STD_UNIQUE_PTR(AddressRange)   m_address_range_ap;
>     uint32_t                       m_type; // Or'ed bits from 
>SpecificationType
> 
> };
>
>Modified: lldb/trunk/include/lldb/Symbol/SymbolVendor.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/SymbolV
>endor.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Symbol/SymbolVendor.h (original)
>+++ lldb/trunk/include/lldb/Symbol/SymbolVendor.h Thu Apr 18 13:10:51 2013
>@@ -191,7 +191,7 @@ protected:
>     TypeList m_type_list; // Uniqued types for all parsers owned by this 
>module
>     CompileUnits m_compile_units; // The current compile units
>     lldb::ObjectFileSP m_objfile_sp;    // Keep a reference to the 
>object file in case it isn't the same as the module object file (debug 
>symbols in a separate file)
>-    std::auto_ptr<SymbolFile> m_sym_file_ap; // A single symbol file. 
>Suclasses can add more of these if needed.
>+    STD_UNIQUE_PTR(SymbolFile) m_sym_file_ap; // A single symbol file. 
>Suclasses can add more of these if needed.
> 
> private:
>     //------------------------------------------------------------------
>
>Modified: lldb/trunk/include/lldb/Target/Process.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Process
>.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Target/Process.h (original)
>+++ lldb/trunk/include/lldb/Target/Process.h Thu Apr 18 13:10:51 2013
>@@ -3588,9 +3588,9 @@ protected:
>     std::vector<lldb::addr_t>   m_image_tokens;
>     Listener                    &m_listener;
>     BreakpointSiteList          m_breakpoint_site_list; ///< This is the 
>list of breakpoint locations we intend to insert in the target.
>-    std::auto_ptr<DynamicLoader> m_dyld_ap;
>-    std::auto_ptr<DynamicCheckerFunctions> m_dynamic_checkers_ap; ///< 
>The functions used by the expression parser to validate data that 
>expressions use.
>-    std::auto_ptr<OperatingSystem> m_os_ap;
>+    STD_UNIQUE_PTR(DynamicLoader) m_dyld_ap;
>+    STD_UNIQUE_PTR(DynamicCheckerFunctions) m_dynamic_checkers_ap; ///< 
>The functions used by the expression parser to validate data that 
>expressions use.
>+    STD_UNIQUE_PTR(OperatingSystem) m_os_ap;
>     UnixSignals                 m_unix_signals;         /// This is the 
>current signal set for this process.
>     lldb::ABISP                 m_abi_sp;
>     lldb::InputReaderSP         m_process_input_reader;
>@@ -3604,7 +3604,7 @@ protected:
>     AllocatedMemoryCache        m_allocated_memory_cache;
>     bool                        m_should_detach;   /// Should we detach 
>if the process object goes away with an explicit call to Kill or Detach?
>     LanguageRuntimeCollection   m_language_runtimes;
>-    std::auto_ptr<NextEventAction> m_next_event_action_ap;
>+    STD_UNIQUE_PTR(NextEventAction) m_next_event_action_ap;
>     std::vector<PreResumeCallbackAndBaton> m_pre_resume_actions;
>     ReadWriteLock               m_public_run_lock;
> #if defined(__APPLE__)
>
>Modified: lldb/trunk/include/lldb/Target/StackFrameList.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/StackFr
>ameList.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Target/StackFrameList.h (original)
>+++ lldb/trunk/include/lldb/Target/StackFrameList.h Thu Apr 18 13:10:51 
>2013
>@@ -98,7 +98,7 @@ protected:
>     SetFrameAtIndex (uint32_t idx, lldb::StackFrameSP &frame_sp);
> 
>     static void
>-    Merge (std::auto_ptr<StackFrameList>& curr_ap, 
>+    Merge (STD_UNIQUE_PTR(StackFrameList)& curr_ap,
>            lldb::StackFrameListSP& prev_sp);
> 
>     void
>
>Modified: lldb/trunk/include/lldb/Target/Target.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Target.
>h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Target/Target.h (original)
>+++ lldb/trunk/include/lldb/Target/Target.h Thu Apr 18 13:10:51 2013
>@@ -1023,7 +1023,7 @@ public:
>         lldb::TargetSP m_target_sp;
>         StringList   m_commands;
>         lldb::SymbolContextSpecifierSP m_specifier_sp;
>-        std::auto_ptr<ThreadSpec> m_thread_spec_ap;
>+        STD_UNIQUE_PTR(ThreadSpec) m_thread_spec_ap;
>         bool m_active;
>         
>         // Use AddStopHook to make a new empty stop hook.  The 
>GetCommandPointer and fill it with commands,
>@@ -1159,12 +1159,12 @@ protected:
>     bool m_valid;
>     lldb::SearchFilterSP  m_search_filter_sp;
>     PathMappingList m_image_search_paths;
>-    std::auto_ptr<ClangASTContext> m_scratch_ast_context_ap;
>-    std::auto_ptr<ClangASTSource> m_scratch_ast_source_ap;
>-    std::auto_ptr<ClangASTImporter> m_ast_importer_ap;
>+    STD_UNIQUE_PTR(ClangASTContext) m_scratch_ast_context_ap;
>+    STD_UNIQUE_PTR(ClangASTSource) m_scratch_ast_source_ap;
>+    STD_UNIQUE_PTR(ClangASTImporter) m_ast_importer_ap;
>     ClangPersistentVariables m_persistent_variables;      ///< These are 
>the persistent variables associated with this process for the expression 
>parser.
> 
>-    std::auto_ptr<SourceManager> m_source_manager_ap;
>+    STD_UNIQUE_PTR(SourceManager) m_source_manager_ap;
> 
>     typedef std::map<lldb::user_id_t, StopHookSP> StopHookCollection;
>     StopHookCollection      m_stop_hooks;
>
>Modified: lldb/trunk/include/lldb/Target/Thread.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Thread.
>h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Target/Thread.h (original)
>+++ lldb/trunk/include/lldb/Target/Thread.h Thu Apr 18 13:10:51 2013
>@@ -966,7 +966,7 @@ protected:
>     lldb::StateType     m_resume_state;         ///< This state is used 
>to force a thread to be suspended from outside the ThreadPlan logic.
>     lldb::StateType     m_temporary_resume_state; ///< This state 
>records what the thread was told to do by the thread plan logic for the 
>current resume.
>                                                   /// It gets set in 
>Thread::WillResume.
>-    std::auto_ptr<lldb_private::Unwind> m_unwinder_ap;
>+    STD_UNIQUE_PTR(lldb_private::Unwind) m_unwinder_ap;
>     bool                m_destroy_called;       // This is used 
>internally to make sure derived Thread classes call DestroyThread.
>     uint32_t m_thread_stop_reason_stop_id;      // This is the stop id 
>for which the StopInfo is valid.  Can use this so you know that
>                                                 // the thread's 
>m_actual_stop_info_sp is current and you don't have to fetch it again
>
>Modified: lldb/trunk/include/lldb/Target/ThreadPlanStepInRange.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/ThreadP
>lanStepInRange.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Target/ThreadPlanStepInRange.h (original)
>+++ lldb/trunk/include/lldb/Target/ThreadPlanStepInRange.h Thu Apr 18 
>13:10:51 2013
>@@ -93,7 +93,7 @@ private:
>     // from step in.
> 
>     static uint32_t s_default_flag_values;
>-    std::auto_ptr<RegularExpression> m_avoid_regexp_ap;
>+    STD_UNIQUE_PTR(RegularExpression) m_avoid_regexp_ap;
>     bool m_step_past_prologue;  // FIXME: For now hard-coded to true, we 
>could put a switch in for this if there's
>                                 // demand for that.
>     bool m_virtual_step;        // true if we've just done a "virtual 
>step", i.e. just moved the inline stack depth.
>
>Modified: lldb/trunk/include/lldb/Utility/PythonPointer.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/Python
>Pointer.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/Utility/PythonPointer.h (original)
>+++ lldb/trunk/include/lldb/Utility/PythonPointer.h Thu Apr 18 13:10:51 
>2013
>@@ -11,7 +11,6 @@
> #define utility_PythonPointer_h_
> 
> #include <algorithm>
>-#include <memory>
> 
> #if defined (__APPLE__)
> #include <Python/Python.h>
>
>Modified: lldb/trunk/include/lldb/lldb-forward.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-forward.h
>?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/include/lldb/lldb-forward.h (original)
>+++ lldb/trunk/include/lldb/lldb-forward.h Thu Apr 18 13:10:51 2013
>@@ -18,12 +18,14 @@
> #include <memory>
> #define STD_SHARED_PTR(T) std::shared_ptr<T>
> #define STD_WEAK_PTR(T) std::weak_ptr<T>
>+#define STD_UNIQUE_PTR(T) std::unique_ptr<T>
> #define STD_ENABLE_SHARED_FROM_THIS(T) std::enable_shared_from_this<T>
> #define STD_STATIC_POINTER_CAST(T,V) std::static_pointer_cast<T>(V)
> #else
> #include <tr1/memory>
> #define STD_SHARED_PTR(T) std::tr1::shared_ptr<T>
> #define STD_WEAK_PTR(T) std::tr1::weak_ptr<T>
>+#define STD_UNIQUE_PTR(T) std::auto_ptr<T>
> #define STD_ENABLE_SHARED_FROM_THIS(T) 
>std::tr1::enable_shared_from_this<T>
> #define STD_STATIC_POINTER_CAST(T,V) std::tr1::static_pointer_cast<T>(V)
> #endif
>
>Modified: lldb/trunk/scripts/Python/interface/SBExpressionOptions.i
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SB
>ExpressionOptions.i?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/scripts/Python/interface/SBExpressionOptions.i (original)
>+++ lldb/trunk/scripts/Python/interface/SBExpressionOptions.i Thu Apr 18 
>13:10:51 2013
>@@ -83,7 +83,7 @@ protected:
> 
> private:
>     // This auto_pointer is made in the constructor and is always valid.
>-    mutable std::auto_ptr<lldb_private::EvaluateExpressionOptions> 
>m_opaque_ap;
>+    mutable STD_UNIQUE_PTR(lldb_private::EvaluateExpressionOptions) 
>m_opaque_ap;
> };
> 
> } // namespace lldb
>
>Modified: lldb/trunk/scripts/Python/interface/SBSection.i
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SB
>Section.i?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/scripts/Python/interface/SBSection.i (original)
>+++ lldb/trunk/scripts/Python/interface/SBSection.i Thu Apr 18 13:10:51 
>2013
>@@ -122,7 +122,7 @@ public:
> 
> private:
> 
>-    std::auto_ptr<lldb_private::SectionImpl> m_opaque_ap;
>+    STD_UNIQUE_PTR(lldb_private::SectionImpl) m_opaque_ap;
> };
> 
> } // namespace lldb
>
>Modified: lldb/trunk/scripts/Python/interface/SBType.i
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/interface/SB
>Type.i?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/scripts/Python/interface/SBType.i (original)
>+++ lldb/trunk/scripts/Python/interface/SBType.i Thu Apr 18 13:10:51 2013
>@@ -65,7 +65,7 @@ public:
>     %}
> 
> protected:
>-    std::auto_ptr<lldb_private::TypeMemberImpl> m_opaque_ap;
>+    STD_UNIQUE_PTR(lldb_private::TypeMemberImpl) m_opaque_ap;
> };
> 
> %feature("docstring",
>
>Modified: lldb/trunk/scripts/Python/python-wrapper.swig
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/python-wrapp
>er.swig?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/scripts/Python/python-wrapper.swig (original)
>+++ lldb/trunk/scripts/Python/python-wrapper.swig Thu Apr 18 13:10:51 2013
>@@ -652,11 +652,11 @@ LLDBSWIGPython_CastPyObjectToSBValue
>     return sb_ptr;
> }
> 
>-// Currently, SBCommandReturnObjectReleaser wraps an std::auto_ptr to an
>+// Currently, SBCommandReturnObjectReleaser wraps a unique pointer to an
> // lldb_private::CommandReturnObject. This means that the destructor for 
>the
> // SB object will deallocate its contained CommandReturnObject. Because 
>that
> // object is used as the real return object for Python-based commands, 
>we want
>-// it to stay around. Thus, we release the auto_ptr before returning from
>+// it to stay around. Thus, we release the unique pointer before 
>returning from
> // LLDBSwigPythonCallCommand, and to guarantee that the release will 
>occur no
> // matter how we exit from the function, we have a releaser object whose
> // destructor does the right thing for us
>
>Modified: lldb/trunk/source/Breakpoint/BreakpointOptions.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/Breakpoin
>tOptions.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Breakpoint/BreakpointOptions.cpp (original)
>+++ lldb/trunk/source/Breakpoint/BreakpointOptions.cpp Thu Apr 18 
>13:10:51 2013
>@@ -41,7 +41,7 @@ BreakpointOptions::BreakpointOptions() :
>     m_enabled (true),
>     m_one_shot (false),
>     m_ignore_count (0),
>-    m_thread_spec_ap (NULL),
>+    m_thread_spec_ap (),
>     m_condition_ap()
> {
> }
>@@ -56,8 +56,8 @@ BreakpointOptions::BreakpointOptions(con
>     m_enabled (rhs.m_enabled),
>     m_one_shot (rhs.m_one_shot),
>     m_ignore_count (rhs.m_ignore_count),
>-    m_thread_spec_ap (NULL),
>-    m_condition_ap (NULL)
>+    m_thread_spec_ap (),
>+    m_condition_ap ()
> {
>     if (rhs.m_thread_spec_ap.get() != NULL)
>         m_thread_spec_ap.reset (new 
>ThreadSpec(*rhs.m_thread_spec_ap.get()));
>
>Modified: lldb/trunk/source/Breakpoint/WatchpointOptions.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Breakpoint/Watchpoin
>tOptions.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Breakpoint/WatchpointOptions.cpp (original)
>+++ lldb/trunk/source/Breakpoint/WatchpointOptions.cpp Thu Apr 18 
>13:10:51 2013
>@@ -38,7 +38,7 @@ WatchpointOptions::WatchpointOptions() :
>     m_callback (WatchpointOptions::NullCallback),
>     m_callback_baton_sp (),
>     m_callback_is_synchronous (false),
>-    m_thread_spec_ap (NULL)
>+    m_thread_spec_ap ()
> {
> }
> 
>@@ -49,7 +49,7 @@ WatchpointOptions::WatchpointOptions(con
>     m_callback (rhs.m_callback),
>     m_callback_baton_sp (rhs.m_callback_baton_sp),
>     m_callback_is_synchronous (rhs.m_callback_is_synchronous),
>-    m_thread_spec_ap (NULL)
>+    m_thread_spec_ap ()
> {
>     if (rhs.m_thread_spec_ap.get() != NULL)
>         m_thread_spec_ap.reset (new 
>ThreadSpec(*rhs.m_thread_spec_ap.get()));
>
>Modified: lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObje
>ctBreakpointCommand.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp 
>(original)
>+++ lldb/trunk/source/Commands/CommandObjectBreakpointCommand.cpp Thu Apr 
>18 13:10:51 2013
>@@ -206,7 +206,7 @@ one command per line.\n" );
>                                              CommandReturnObject &result)
>     {
>         InputReaderSP reader_sp (new 
>InputReader(m_interpreter.GetDebugger()));
>-        std::auto_ptr<BreakpointOptions::CommandData> data_ap(new 
>BreakpointOptions::CommandData());
>+        STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new 
>BreakpointOptions::CommandData());
>         if (reader_sp && data_ap.get())
>         {
>             BatonSP baton_sp (new BreakpointOptions::CommandBaton 
>(data_ap.release()));
>@@ -242,7 +242,7 @@ one command per line.\n" );
>     SetBreakpointCommandCallback (BreakpointOptions *bp_options,
>                                   const char *oneliner)
>     {
>-        std::auto_ptr<BreakpointOptions::CommandData> data_ap(new 
>BreakpointOptions::CommandData());
>+        STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new 
>BreakpointOptions::CommandData());
> 
>         // It's necessary to set both user_source and script_source to 
>the oneliner.
>         // The former is used to generate callback description (as in 
>breakpoint command list)
>
>Modified: lldb/trunk/source/Commands/CommandObjectCommands.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObje
>ctCommands.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Commands/CommandObjectCommands.cpp (original)
>+++ lldb/trunk/source/Commands/CommandObjectCommands.cpp Thu Apr 18 
>13:10:51 2013
>@@ -1066,7 +1066,7 @@ protected:
>     }
> 
> private:
>-    std::auto_ptr<CommandObjectRegexCommand> m_regex_cmd_ap;    
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand) m_regex_cmd_ap;
> 
>      class CommandOptions : public Options
>      {
>
>Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObje
>ctTarget.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original)
>+++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Thu Apr 18 
>13:10:51 2013
>@@ -4882,7 +4882,7 @@ protected:
>             target->AddStopHook (new_hook_sp);
> 
>             //  First step, make the specifier.
>-            std::auto_ptr<SymbolContextSpecifier> specifier_ap;
>+            STD_UNIQUE_PTR(SymbolContextSpecifier) specifier_ap;
>             if (m_options.m_sym_ctx_specified)
>             {
>                 specifier_ap.reset(new 
>SymbolContextSpecifier(m_interpreter.GetDebugger().GetSelectedTarget()));
>
>Modified: lldb/trunk/source/Commands/CommandObjectWatchpointCommand.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObje
>ctWatchpointCommand.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Commands/CommandObjectWatchpointCommand.cpp 
>(original)
>+++ lldb/trunk/source/Commands/CommandObjectWatchpointCommand.cpp Thu Apr 
>18 13:10:51 2013
>@@ -190,7 +190,7 @@ but do NOT enter more than one command p
>                                              CommandReturnObject &result)
>     {
>         InputReaderSP reader_sp (new 
>InputReader(m_interpreter.GetDebugger()));
>-        std::auto_ptr<WatchpointOptions::CommandData> data_ap(new 
>WatchpointOptions::CommandData());
>+        STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new 
>WatchpointOptions::CommandData());
>         if (reader_sp && data_ap.get())
>         {
>             BatonSP baton_sp (new WatchpointOptions::CommandBaton 
>(data_ap.release()));
>@@ -226,7 +226,7 @@ but do NOT enter more than one command p
>     SetWatchpointCommandCallback (WatchpointOptions *wp_options,
>                                   const char *oneliner)
>     {
>-        std::auto_ptr<WatchpointOptions::CommandData> data_ap(new 
>WatchpointOptions::CommandData());
>+        STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new 
>WatchpointOptions::CommandData());
> 
>         // It's necessary to set both user_source and script_source to 
>the oneliner.
>         // The former is used to generate callback description (as in 
>watchpoint command list)
>
>Modified: lldb/trunk/source/Core/Communication.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Communication.c
>pp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Core/Communication.cpp (original)
>+++ lldb/trunk/source/Core/Communication.cpp Thu Apr 18 13:10:51 2013
>@@ -108,7 +108,7 @@ Communication::Disconnect (Error *error_
>         // don't want to pay for the overhead it might cause if every 
>time we
>         // access the connection we have to take a lock.
>         //
>-        // This auto_ptr will cleanup after itself when this object goes 
>away,
>+        // This unique pointer will cleanup after itself when this 
>object goes away,
>         // so there is no need to currently have it destroy itself 
>immediately
>         // upon disconnnect.
>         //connection_sp.reset();
>
>Modified: lldb/trunk/source/Core/Disassembler.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cp
>p?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Core/Disassembler.cpp (original)
>+++ lldb/trunk/source/Core/Disassembler.cpp Thu Apr 18 13:10:51 2013
>@@ -638,7 +638,7 @@ Instruction::Dump (lldb_private::Stream
> bool
> Instruction::DumpEmulation (const ArchSpec &arch)
> {
>-	std::auto_ptr<EmulateInstruction> insn_emulator_ap 
>(EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
>+	STD_UNIQUE_PTR(EmulateInstruction) insn_emulator_ap 
>(EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
> 	if (insn_emulator_ap.get())
> 	{
>         insn_emulator_ap->SetInstruction (GetOpcode(), GetAddress(), 
>NULL);
>@@ -904,7 +904,7 @@ Instruction::TestEmulation (Stream *out_
>     arch.SetTriple (llvm::Triple (value_sp->GetStringValue()));
> 
>     bool success = false;
>-    std::auto_ptr<EmulateInstruction> insn_emulator_ap 
>(EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
>+    STD_UNIQUE_PTR(EmulateInstruction) insn_emulator_ap 
>(EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
>     if (insn_emulator_ap.get())
>         success = insn_emulator_ap->TestEmulation (out_stream, arch, 
>data_dictionary);
> 
>@@ -925,7 +925,7 @@ Instruction::Emulate (const ArchSpec &ar
>                       EmulateInstruction::ReadRegisterCallback 
>read_reg_callback,
>                       EmulateInstruction::WriteRegisterCallback 
>write_reg_callback)
> {
>-	std::auto_ptr<EmulateInstruction> insn_emulator_ap 
>(EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
>+	STD_UNIQUE_PTR(EmulateInstruction) insn_emulator_ap 
>(EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
> 	if (insn_emulator_ap.get())
> 	{
> 		insn_emulator_ap->SetBaton (baton);
>
>Modified: lldb/trunk/source/Core/DynamicLoader.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/DynamicLoader.c
>pp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Core/DynamicLoader.cpp (original)
>+++ lldb/trunk/source/Core/DynamicLoader.cpp Thu Apr 18 13:10:51 2013
>@@ -24,7 +24,7 @@ DynamicLoader::FindPlugin (Process *proc
>         create_callback  = 
>PluginManager::GetDynamicLoaderCreateCallbackForPluginName (plugin_name);
>         if (create_callback)
>         {
>-            std::auto_ptr<DynamicLoader> 
>instance_ap(create_callback(process, true));
>+            STD_UNIQUE_PTR(DynamicLoader) 
>instance_ap(create_callback(process, true));
>             if (instance_ap.get())
>                 return instance_ap.release();
>         }
>@@ -33,7 +33,7 @@ DynamicLoader::FindPlugin (Process *proc
>     {
>         for (uint32_t idx = 0; (create_callback = 
>PluginManager::GetDynamicLoaderCreateCallbackAtIndex(idx)) != NULL; ++idx)
>         {
>-            std::auto_ptr<DynamicLoader> 
>instance_ap(create_callback(process, false));
>+            STD_UNIQUE_PTR(DynamicLoader) 
>instance_ap(create_callback(process, false));
>             if (instance_ap.get())
>                 return instance_ap.release();
>         }
>
>Modified: lldb/trunk/source/Core/Module.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Module.cpp?rev=
>179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Core/Module.cpp (original)
>+++ lldb/trunk/source/Core/Module.cpp Thu Apr 18 13:10:51 2013
>@@ -254,7 +254,7 @@ Module::GetMemoryObjectFile (const lldb:
>         if (process_sp)
>         {
>             m_did_load_objfile = true;
>-            std::auto_ptr<DataBufferHeap> data_ap (new DataBufferHeap 
>(512, 0));
>+            STD_UNIQUE_PTR(DataBufferHeap) data_ap (new DataBufferHeap 
>(512, 0));
>             Error readmem_error;
>             const size_t bytes_read = process_sp->ReadMemory 
>(header_addr, 
>                                                               
>data_ap->GetBytes(), 
>@@ -1185,6 +1185,15 @@ Module::GetModificationTime () const
>     return m_mod_time;
> }
> 
>+void
>+Module::SetSymbolFileFileSpec (const FileSpec &file)
>+{
>+    m_symfile_spec = file;
>+    m_symfile_ap.reset();
>+    m_did_load_symbol_vendor = false;
>+}
>+
>+
> bool
> Module::IsExecutable ()
> {
>
>Modified: lldb/trunk/source/Core/StreamAsynchronousIO.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/StreamAsynchron
>ousIO.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Core/StreamAsynchronousIO.cpp (original)
>+++ lldb/trunk/source/Core/StreamAsynchronousIO.cpp Thu Apr 18 13:10:51 
>2013
>@@ -35,7 +35,7 @@ StreamAsynchronousIO::Flush ()
> {
>     if (m_accumulated_data.GetSize() > 0)
>     {
>-        std::auto_ptr<EventDataBytes> data_bytes_ap (new EventDataBytes);
>+        STD_UNIQUE_PTR(EventDataBytes) data_bytes_ap (new 
>EventDataBytes);
>         // Let's swap the bytes to avoid LARGE string copies.
>         data_bytes_ap->SwapBytes (m_accumulated_data.GetString());
>         EventSP new_event_sp (new Event (m_broadcast_event_type, 
>data_bytes_ap.release()));
>
>Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpr
>essionDeclMap.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
>+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Thu Apr 18 
>13:10:51 2013
>@@ -1117,7 +1117,7 @@ ClangExpressionDeclMap::LookupDecl (clan
> 
>         if (parser_vars->m_lldb_var)
>         {
>-            std::auto_ptr<Value> 
>value(GetVariableValue(parser_vars->m_lldb_var, NULL));
>+            STD_UNIQUE_PTR(Value) 
>value(GetVariableValue(parser_vars->m_lldb_var, NULL));
>             
>             if (is_reference && value.get() && value->GetValueType() == 
>Value::eValueTypeLoadAddress)
>             {
>@@ -1252,7 +1252,7 @@ ClangExpressionDeclMap::GetSpecialValue
>         !var->LocationIsValidForFrame (frame))
>         return Value();
>     
>-    std::auto_ptr<Value> value(GetVariableValue(var, NULL));
>+    STD_UNIQUE_PTR(Value) value(GetVariableValue(var, NULL));
>     
>     if (value.get() && value->GetValueType() == 
>Value::eValueTypeLoadAddress)
>     {
>@@ -1347,7 +1347,7 @@ ClangExpressionDeclMap::GetObjectPointer
>         return false;
>     }
>     
>-    std::auto_ptr<lldb_private::Value> 
>location_value(GetVariableValue(object_ptr_var,
>+    STD_UNIQUE_PTR(lldb_private::Value) 
>location_value(GetVariableValue(object_ptr_var,
>                                                                        
>NULL));
>     
>     if (!location_value.get())
>@@ -2534,7 +2534,7 @@ ClangExpressionDeclMap::GetVariableValue
>     
>     DWARFExpression &var_location_expr = var->LocationExpression();
>     
>-    std::auto_ptr<Value> var_location(new Value);
>+    STD_UNIQUE_PTR(Value) var_location(new Value);
>     
>     lldb::addr_t loclist_base_load_addr = LLDB_INVALID_ADDRESS;
>     
>@@ -2756,7 +2756,7 @@ ClangExpressionDeclMap::AddOneGenericVar
>                                                                       
>m_parser_vars->m_target_info.address_byte_size));
>     assert (entity.get());
>     
>-    std::auto_ptr<Value> symbol_location(new Value);
>+    STD_UNIQUE_PTR(Value) symbol_location(new Value);
>     
>     const Address &symbol_address = symbol.GetAddress();
>     lldb::addr_t symbol_load_addr = 
>symbol_address.GetLoadAddress(target);
>@@ -2900,7 +2900,7 @@ ClangExpressionDeclMap::AddOneFunction (
>     Log *log(lldb_private::GetLogIfAllCategoriesSet 
>(LIBLLDB_LOG_EXPRESSIONS));
>     
>     NamedDecl *fun_decl = NULL;
>-    std::auto_ptr<Value> fun_location(new Value);
>+    STD_UNIQUE_PTR(Value) fun_location(new Value);
>     const Address *fun_address = NULL;
>     
>     // only valid for Functions, not for Symbols
>
>Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpr
>essionParser.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Expression/ClangExpressionParser.cpp (original)
>+++ lldb/trunk/source/Expression/ClangExpressionParser.cpp Thu Apr 18 
>13:10:51 2013
>@@ -188,7 +188,7 @@ ClangExpressionParser::ClangExpressionPa
>                                               ClangExpression &expr) :
>     m_expr (expr),
>     m_compiler (),
>-    m_code_generator (NULL)
>+    m_code_generator ()
> {
>     // Initialize targets first, so that --version shows registered 
>targets.
>     static struct InitializeLLVM {
>@@ -351,13 +351,13 @@ ClangExpressionParser::ClangExpressionPa
>     m_selector_table.reset(new SelectorTable());
>     m_builtin_context.reset(new Builtin::Context());
>     
>-    std::auto_ptr<clang::ASTContext> ast_context(new 
>ASTContext(m_compiler->getLangOpts(),
>-                                                                
>m_compiler->getSourceManager(),
>-                                                                
>&m_compiler->getTarget(),
>-                                                                
>m_compiler->getPreprocessor().getIdentifierTable(),
>-                                                                
>*m_selector_table.get(),
>-                                                                
>*m_builtin_context.get(),
>-                                                                0));
>+    STD_UNIQUE_PTR(clang::ASTContext) ast_context(new 
>ASTContext(m_compiler->getLangOpts(),
>+                                                                 
>m_compiler->getSourceManager(),
>+                                                                 
>&m_compiler->getTarget(),
>+                                                                 
>m_compiler->getPreprocessor().getIdentifierTable(),
>+                                                                 
>*m_selector_table.get(),
>+                                                                 
>*m_builtin_context.get(),
>+                                                                 0));
>     
>     ClangExpressionDeclMap *decl_map = m_expr.DeclMap();
>     
>@@ -462,7 +462,7 @@ static bool FindFunctionInModule (ConstS
> Error
> ClangExpressionParser::PrepareForExecution (lldb::addr_t &func_addr, 
>                                             lldb::addr_t &func_end,
>-                                            
>std::auto_ptr<IRExecutionUnit> &execution_unit_ap,
>+                                            
>STD_UNIQUE_PTR(IRExecutionUnit) &execution_unit_ap,
>                                             ExecutionContext &exe_ctx,
>                                             bool &evaluated_statically,
>                                             
>lldb::ClangExpressionVariableSP &const_result,
>@@ -472,11 +472,11 @@ ClangExpressionParser::PrepareForExecuti
> 	func_end = LLDB_INVALID_ADDRESS;
>     Log *log(lldb_private::GetLogIfAllCategoriesSet 
>(LIBLLDB_LOG_EXPRESSIONS));
> 
>-    std::auto_ptr<llvm::ExecutionEngine> execution_engine_ap;
>+    STD_UNIQUE_PTR(llvm::ExecutionEngine) execution_engine_ap;
>     
>     Error err;
>     
>-    std::auto_ptr<llvm::Module> module_ap 
>(m_code_generator->ReleaseModule());
>+    STD_UNIQUE_PTR(llvm::Module) module_ap 
>(m_code_generator->ReleaseModule());
> 
>     if (!module_ap.get())
>     {
>@@ -596,7 +596,7 @@ ClangExpressionParser::PrepareForExecuti
>     
>     m_execution_unit->GetRunnableInfo(err, func_addr, func_end);
>     
>-    execution_unit_ap = m_execution_unit;
>+    execution_unit_ap.reset (m_execution_unit.release());
>         
>     return err;
> }
>
>Modified: lldb/trunk/source/Expression/ClangFunction.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangFunc
>tion.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Expression/ClangFunction.cpp (original)
>+++ lldb/trunk/source/Expression/ClangFunction.cpp Thu Apr 18 13:10:51 
>2013
>@@ -25,6 +25,7 @@
> #include "lldb/Expression/ASTStructExtractor.h"
> #include "lldb/Expression/ClangExpressionParser.h"
> #include "lldb/Expression/ClangFunction.h"
>+#include "lldb/Expression/IRExecutionUnit.h"
> #include "lldb/Symbol/Type.h"
> #include "lldb/Core/DataExtractor.h"
> #include "lldb/Core/State.h"
>
>Modified: lldb/trunk/source/Expression/ClangUserExpression.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUser
>Expression.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Expression/ClangUserExpression.cpp (original)
>+++ lldb/trunk/source/Expression/ClangUserExpression.cpp Thu Apr 18 
>13:10:51 2013
>@@ -396,7 +396,7 @@ ClangUserExpression::Parse (Stream &erro
>     ApplyObjcCastHack(m_expr_text);
>     //ApplyUnicharHack(m_expr_text);
> 
>-    std::auto_ptr <ExpressionSourceCode> source_code 
>(ExpressionSourceCode::CreateWrapped(m_expr_prefix.c_str(), 
>m_expr_text.c_str()));
>+    STD_UNIQUE_PTR(ExpressionSourceCode) source_code 
>(ExpressionSourceCode::CreateWrapped(m_expr_prefix.c_str(), 
>m_expr_text.c_str()));
>     
>     lldb::LanguageType lang_type;
>     
>
>Modified: lldb/trunk/source/Expression/ClangUtilityFunction.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUtil
>ityFunction.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Expression/ClangUtilityFunction.cpp (original)
>+++ lldb/trunk/source/Expression/ClangUtilityFunction.cpp Thu Apr 18 
>13:10:51 2013
>@@ -23,6 +23,7 @@
> #include "lldb/Expression/ClangExpressionParser.h"
> #include "lldb/Expression/ClangUtilityFunction.h"
> #include "lldb/Expression/ExpressionSourceCode.h"
>+#include "lldb/Expression/IRExecutionUnit.h"
> #include "lldb/Host/Host.h"
> #include "lldb/Target/ExecutionContext.h"
> #include "lldb/Target/Target.h"
>
>Modified: lldb/trunk/source/Expression/DWARFExpression.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/DWARFExpr
>ession.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Expression/DWARFExpression.cpp (original)
>+++ lldb/trunk/source/Expression/DWARFExpression.cpp Thu Apr 18 13:10:51 
>2013
>@@ -1062,8 +1062,8 @@ DWARFExpression::Update_DW_OP_addr (lldb
>             // we then replace the data for this expression
>             
>             // So first we copy the data into a heap buffer
>-            std::auto_ptr<DataBufferHeap> head_data_ap (new 
>DataBufferHeap (m_data.GetDataStart(), 
>-                                                                         
>   m_data.GetByteSize()));
>+            STD_UNIQUE_PTR(DataBufferHeap) head_data_ap (new 
>DataBufferHeap (m_data.GetDataStart(),
>+                                                                         
>    m_data.GetByteSize()));
>             
>             // Make en encoder so we can write the address into the 
>buffer using
>             // the correct byte order (endianness)
>
>Modified: lldb/trunk/source/Expression/IRExecutionUnit.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRExecuti
>onUnit.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Expression/IRExecutionUnit.cpp (original)
>+++ lldb/trunk/source/Expression/IRExecutionUnit.cpp Thu Apr 18 13:10:51 
>2013
>@@ -25,14 +25,14 @@
> 
> using namespace lldb_private;
> 
>-IRExecutionUnit::IRExecutionUnit (std::auto_ptr<llvm::LLVMContext> 
>&context_ap,
>-                                  std::auto_ptr<llvm::Module> &module_ap,
>+IRExecutionUnit::IRExecutionUnit (STD_UNIQUE_PTR(llvm::LLVMContext) 
>&context_ap,
>+                                  STD_UNIQUE_PTR(llvm::Module) 
>&module_ap,
>                                   ConstString &name,
>                                   const lldb::TargetSP &target_sp,
>                                   std::vector<std::string> 
>&cpu_features) :
>     IRMemoryMap(target_sp),
>-    m_context_ap(context_ap),
>-    m_module_ap(module_ap),
>+    m_context_ap(context_ap.release()),
>+    m_module_ap(module_ap.release()),
>     m_module(m_module_ap.get()),
>     m_cpu_features(cpu_features),
>     m_name(name),
>
>Modified: lldb/trunk/source/Expression/IRInterpreter.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRInterpr
>eter.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Expression/IRInterpreter.cpp (original)
>+++ lldb/trunk/source/Expression/IRInterpreter.cpp Thu Apr 18 13:10:51 
>2013
>@@ -817,7 +817,7 @@ IRInterpreter::maybeRunOnFunction (lldb_
> }
> 
> static const char *unsupported_opcode_error         = "Interpreter 
>doesn't handle one of the expression's opcodes";
>-static const char *interpreter_initialization_error = "Interpreter 
>couldn't be initialized";
>+//static const char *interpreter_initialization_error = "Interpreter 
>couldn't be initialized";
> static const char *interpreter_internal_error       = "Interpreter 
>encountered an internal error";
> static const char *bad_value_error                  = "Interpreter 
>couldn't resolve a value during execution";
> static const char *memory_allocation_error          = "Interpreter 
>couldn't allocate memory";
>
>Modified: lldb/trunk/source/Host/common/File.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/File.cpp
>?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Host/common/File.cpp (original)
>+++ lldb/trunk/source/Host/common/File.cpp Thu Apr 18 13:10:51 2013
>@@ -556,7 +556,7 @@ File::Read (size_t &num_bytes, off_t &of
>                     if (num_bytes > bytes_left)
>                         num_bytes = bytes_left;
>                         
>-                    std::auto_ptr<DataBufferHeap> data_heap_ap;
>+                    STD_UNIQUE_PTR(DataBufferHeap) data_heap_ap;
>                     data_heap_ap.reset(new DataBufferHeap(num_bytes + 
>(null_terminate ? 1 : 0), '\0'));
>                         
>                     if (data_heap_ap.get())
>
>Modified: lldb/trunk/source/Host/common/FileSpec.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/FileSpec
>.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Host/common/FileSpec.cpp (original)
>+++ lldb/trunk/source/Host/common/FileSpec.cpp Thu Apr 18 13:10:51 2013
>@@ -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<DataBufferMemoryMap> 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
>     char path[PATH_MAX];
>     if (GetPath(path, sizeof(path)))
>     {
>-        ifstream file_stream (path);
>+        std::ifstream file_stream (path);
> 
>         if (file_stream)
>         {
>
>Modified: lldb/trunk/source/Host/common/Host.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Host.cpp
>?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Host/common/Host.cpp (original)
>+++ lldb/trunk/source/Host/common/Host.cpp Thu Apr 18 13:10:51 2013
>@@ -1313,7 +1313,7 @@ Host::RunShellCommand (const char *comma
>     }
>     
>     // The process monitor callback will delete the 'shell_info_ptr' 
>below...
>-    std::auto_ptr<ShellInfo> shell_info_ap (new ShellInfo());
>+    STD_UNIQUE_PTR(ShellInfo) shell_info_ap (new ShellInfo());
>     
>     const bool monitor_signals = false;
>     launch_info.SetMonitorProcessCallback(MonitorShellCommand, 
>shell_info_ap.get(), monitor_signals);
>@@ -1324,7 +1324,7 @@ Host::RunShellCommand (const char *comma
>     {
>         // The process successfully launched, so we can defer ownership 
>of
>         // "shell_info" to the MonitorShellCommand callback function 
>that will
>-        // get called when the process dies. We release the 
>std::auto_ptr as it
>+        // get called when the process dies. We release the unique 
>pointer as it
>         // doesn't need to delete the ShellInfo anymore.
>         ShellInfo *shell_info = shell_info_ap.release();
>         TimeValue timeout_time(TimeValue::Now());
>
>Modified: lldb/trunk/source/Host/freebsd/Host.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/freebsd/Host.cp
>p?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Host/freebsd/Host.cpp (original)
>+++ lldb/trunk/source/Host/freebsd/Host.cpp Thu Apr 18 13:10:51 2013
>@@ -294,7 +294,7 @@ Host::GetAuxvData(lldb_private::Process
>    struct ps_strings ps_strings;
>    struct ptrace_io_desc pid;
>    DataBufferSP buf_sp;
>-   std::auto_ptr<DataBufferHeap> buf_ap(new DataBufferHeap(1024, 0));
>+   STD_UNIQUE_PTR(DataBufferHeap) buf_ap(new DataBufferHeap(1024, 0));
> 
>    if (::sysctl(mib, 2, &ps_strings_addr, &ps_strings_size, NULL, 0) == 
>0) {
>            pid.piod_op = PIOD_READ_D;
>
>Modified: lldb/trunk/source/Host/linux/Host.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/linux/Host.cpp?
>rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Host/linux/Host.cpp (original)
>+++ lldb/trunk/source/Host/linux/Host.cpp Thu Apr 18 13:10:51 2013
>@@ -72,7 +72,7 @@ Host::GetAuxvData(lldb_private::Process
>         return buf_sp;
> 
>     size_t bytes_read = 0;
>-    std::auto_ptr<DataBufferHeap> buf_ap(new DataBufferHeap(1024, 0));
>+    STD_UNIQUE_PTR(DataBufferHeap) buf_ap(new DataBufferHeap(1024, 0));
>     for (;;) 
>     {
>         size_t avail = buf_ap->GetByteSize() - bytes_read;
>
>Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandI
>nterpreter.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
>+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Thu Apr 18 
>13:10:51 2013
>@@ -391,7 +391,7 @@ CommandInterpreter::LoadCommandDictionar
>     
>     size_t num_regexes = sizeof break_regexes/sizeof(char *[2]);
>         
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     break_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                       "_regexp-break",
>                                                       "Set a breakpoint 
>using a regular expression to specify the location, where <linenum> is in 
>decimal and <address> is in hex.",
>@@ -418,7 +418,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
> 
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     tbreak_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                       "_regexp-tbreak",
>                                                       "Set a one shot 
>breakpoint using a regular expression to specify the location, where 
><linenum> is in decimal and <address> is in hex.",
>@@ -449,7 +449,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
> 
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     attach_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                        "_regexp-attach",
>                                                        "Attach to a 
>process id if in decimal, otherwise treat the argument as a process name 
>to attach to.",
>@@ -467,7 +467,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
>     
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     down_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                      "_regexp-down",
>                                                      "Go down \"n\" 
>frames in the stack (1 frame by default).",
>@@ -482,7 +482,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
>     
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     up_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                    "_regexp-up",
>                                                    "Go up \"n\" frames 
>in the stack (1 frame by default).",
>@@ -497,7 +497,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
> 
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     display_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                         
>"_regexp-display",
>                                                         "Add an 
>expression evaluation stop-hook.",
>@@ -511,7 +511,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
> 
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     undisplay_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                           
>"_regexp-undisplay",
>                                                           "Remove an 
>expression evaluation stop-hook.",
>@@ -525,7 +525,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
> 
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     connect_gdb_remote_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                              
>"gdb-remote",
>                                                              "Connect to 
>a remote GDB server.  If no hostname is provided, localhost is assumed.",
>@@ -540,7 +540,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
> 
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     connect_kdp_remote_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                              
>"kdp-remote",
>                                                              "Connect to 
>a remote KDP server.  udp port 41139 is the default port number.",
>@@ -555,7 +555,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
> 
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     bt_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                      "_regexp-bt",
>                                                      "Show a backtrace.  
>An optional argument is accepted; if that argument is a number, it 
>specifies the number of frames to display.  If that argument is 'all', 
>full backtraces of all threads are displayed.",
>@@ -575,7 +575,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
> 
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     list_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                      "_regexp-list",
>                                                      "Implements the GDB 
>'list' command in all of its forms except FILE:FUNCTION and maps them to 
>the appropriate 'source list' commands.",
>@@ -597,7 +597,7 @@ CommandInterpreter::LoadCommandDictionar
>         }
>     }
> 
>-    std::auto_ptr<CommandObjectRegexCommand>
>+    STD_UNIQUE_PTR(CommandObjectRegexCommand)
>     env_regex_cmd_ap(new CommandObjectRegexCommand (*this,
>                                                     "_regexp-env",
>                                                     "Implements a 
>shortcut to viewing and setting environment variables.",
>
>Modified: lldb/trunk/source/Interpreter/Options.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Options.
>cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Interpreter/Options.cpp (original)
>+++ lldb/trunk/source/Interpreter/Options.cpp Thu Apr 18 13:10:51 2013
>@@ -901,7 +901,7 @@ Options::HandleOptionArgumentCompletion
> )
> {
>     const OptionDefinition *opt_defs = GetDefinitions();
>-    std::auto_ptr<SearchFilter> filter_ap;
>+    STD_UNIQUE_PTR(SearchFilter) filter_ap;
> 
>     int opt_arg_pos = opt_element_vector[opt_element_index].opt_arg_pos;
>     int opt_defs_index = 
>opt_element_vector[opt_element_index].opt_defs_index;
>
>Modified: lldb/trunk/source/Interpreter/ScriptInterpreter.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/ScriptIn
>terpreter.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Interpreter/ScriptInterpreter.cpp (original)
>+++ lldb/trunk/source/Interpreter/ScriptInterpreter.cpp Thu Apr 18 
>13:10:51 2013
>@@ -81,10 +81,10 @@ ScriptInterpreter::LanguageToString (lld
>     return return_value;
> }
> 
>-std::auto_ptr<ScriptInterpreterLocker>
>+STD_UNIQUE_PTR(ScriptInterpreterLocker)
> ScriptInterpreter::AcquireInterpreterLock ()
> {
>-    return std::auto_ptr<ScriptInterpreterLocker>(new 
>ScriptInterpreterLocker());
>+    return STD_UNIQUE_PTR(ScriptInterpreterLocker)(new 
>ScriptInterpreterLocker());
> }
> 
> void
>
>Modified: lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/ScriptIn
>terpreterPython.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp (original)
>+++ lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp Thu Apr 18 
>13:10:51 2013
>@@ -1321,7 +1321,7 @@ ScriptInterpreterPython::GenerateBreakpo
>     case eInputReaderDone:
>         {
>             BreakpointOptions *bp_options = (BreakpointOptions *)baton;
>-            std::auto_ptr<BreakpointOptions::CommandData> data_ap(new 
>BreakpointOptions::CommandData());
>+            STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new 
>BreakpointOptions::CommandData());
>             data_ap->user_source.AppendList (commands_in_progress);
>             if (data_ap.get())
>             {
>@@ -1427,7 +1427,7 @@ ScriptInterpreterPython::GenerateWatchpo
>     case eInputReaderDone:
>         {
>             WatchpointOptions *wp_options = (WatchpointOptions *)baton;
>-            std::auto_ptr<WatchpointOptions::CommandData> data_ap(new 
>WatchpointOptions::CommandData());
>+            STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new 
>WatchpointOptions::CommandData());
>             data_ap->user_source.AppendList (commands_in_progress);
>             if (data_ap.get())
>             {
>@@ -1534,7 +1534,7 @@ void
> ScriptInterpreterPython::SetBreakpointCommandCallback (BreakpointOptions 
>*bp_options,
>                                                        const char 
>*oneliner)
> {
>-    std::auto_ptr<BreakpointOptions::CommandData> data_ap(new 
>BreakpointOptions::CommandData());
>+    STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new 
>BreakpointOptions::CommandData());
> 
>     // It's necessary to set both user_source and script_source to the 
>oneliner.
>     // The former is used to generate callback description (as in 
>breakpoint command list)
>@@ -1557,7 +1557,7 @@ void
> ScriptInterpreterPython::SetWatchpointCommandCallback (WatchpointOptions 
>*wp_options,
>                                                        const char 
>*oneliner)
> {
>-    std::auto_ptr<WatchpointOptions::CommandData> data_ap(new 
>WatchpointOptions::CommandData());
>+    STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new 
>WatchpointOptions::CommandData());
> 
>     // It's necessary to set both user_source and script_source to the 
>oneliner.
>     // The former is used to generate callback description (as in 
>watchpoint command list)
>@@ -2807,10 +2807,10 @@ ScriptInterpreterPython::GetDocumentatio
>     }
> }
> 
>-std::auto_ptr<ScriptInterpreterLocker>
>+STD_UNIQUE_PTR(ScriptInterpreterLocker)
> ScriptInterpreterPython::AcquireInterpreterLock ()
> {
>-    std::auto_ptr<ScriptInterpreterLocker> py_lock(new Locker(this,
>+    STD_UNIQUE_PTR(ScriptInterpreterLocker) py_lock(new Locker(this,
>                                                               
>Locker::AcquireLock | Locker::InitSession,
>                                                               
>Locker::FreeLock | Locker::TearDownSession));
>     return py_lock;
>
>Modified: 
>lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler
>/llvm/DisassemblerLLVMC.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp 
>(original)
>+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp Thu 
>Apr 18 13:10:51 2013
>@@ -472,6 +472,10 @@ DisassemblerLLVMC::LLVMCDisassembler::LL
>         m_is_valid = false;
> }
> 
>+DisassemblerLLVMC::LLVMCDisassembler::~LLVMCDisassembler()
>+{
>+}
>+
> namespace {
>     // This is the memory object we use in GetInstruction.
>     class LLDBDisasmMemoryObject : public llvm::MemoryObject {
>@@ -563,7 +567,7 @@ DisassemblerLLVMC::CreateInstance (const
> {
>     if (arch.GetTriple().getArch() != llvm::Triple::UnknownArch)
>     {
>-        std::auto_ptr<DisassemblerLLVMC> disasm_ap (new 
>DisassemblerLLVMC(arch, flavor));
>+        STD_UNIQUE_PTR(DisassemblerLLVMC) disasm_ap (new 
>DisassemblerLLVMC(arch, flavor));
>     
>         if (disasm_ap.get() && disasm_ap->IsValid())
>             return disasm_ap.release();
>
>Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler
>/llvm/DisassemblerLLVMC.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h 
>(original)
>+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h Thu 
>Apr 18 13:10:51 2013
>@@ -43,7 +43,7 @@ class DisassemblerLLVMC : public lldb_pr
>     public:
>         LLVMCDisassembler (const char *triple, unsigned flavor, 
>DisassemblerLLVMC &owner);
>         
>-        ~LLVMCDisassembler() {};
>+        ~LLVMCDisassembler();
>         
>         uint64_t GetMCInst (const uint8_t *opcode_data, size_t 
>opcode_data_len, lldb::addr_t pc, llvm::MCInst &mc_inst);
>         uint64_t PrintMCInst (llvm::MCInst &mc_inst, char 
>*output_buffer, size_t out_buffer_len);
>@@ -54,14 +54,14 @@ class DisassemblerLLVMC : public lldb_pr
>         }
>         
>     private:
>-        bool                                 m_is_valid;
>-        std::auto_ptr<llvm::MCContext>       m_context_ap;
>-        std::auto_ptr<llvm::MCAsmInfo>       m_asm_info_ap;
>-        std::auto_ptr<llvm::MCSubtargetInfo> m_subtarget_info_ap;
>-        std::auto_ptr<llvm::MCInstrInfo>     m_instr_info_ap;
>-        std::auto_ptr<llvm::MCRegisterInfo>  m_reg_info_ap;
>-        std::auto_ptr<llvm::MCInstPrinter>   m_instr_printer_ap;
>-        std::auto_ptr<llvm::MCDisassembler>  m_disasm_ap;
>+        bool                                    m_is_valid;
>+        STD_UNIQUE_PTR(llvm::MCContext)         m_context_ap;
>+        STD_UNIQUE_PTR(llvm::MCAsmInfo)         m_asm_info_ap;
>+        STD_UNIQUE_PTR(llvm::MCSubtargetInfo)   m_subtarget_info_ap;
>+        STD_UNIQUE_PTR(llvm::MCInstrInfo)       m_instr_info_ap;
>+        STD_UNIQUE_PTR(llvm::MCRegisterInfo)    m_reg_info_ap;
>+        STD_UNIQUE_PTR(llvm::MCInstPrinter)     m_instr_printer_ap;
>+        STD_UNIQUE_PTR(llvm::MCDisassembler)    m_disasm_ap;
>     };
> 
> public:
>@@ -164,8 +164,8 @@ protected:
>     lldb_private::Mutex m_mutex;
>     bool m_data_from_file;
>     
>-    std::auto_ptr<LLVMCDisassembler> m_disasm_ap;
>-    std::auto_ptr<LLVMCDisassembler> m_alternate_disasm_ap;
>+    STD_UNIQUE_PTR(LLVMCDisassembler) m_disasm_ap;
>+    STD_UNIQUE_PTR(LLVMCDisassembler) m_alternate_disasm_ap;
> };
> 
> #endif  // liblldb_DisassemblerLLVM_h_
>
>Modified: 
>lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.
>cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoade
>r/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp?rev=179779&r1=179778&r2=179779&vie
>w=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.
>cpp (original)
>+++ 
>lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.
>cpp Thu Apr 18 13:10:51 2013
>@@ -98,7 +98,7 @@ DynamicLoaderPOSIXDYLD::DynamicLoaderPOS
>       m_rendezvous(process),
>       m_load_offset(LLDB_INVALID_ADDRESS),
>       m_entry_point(LLDB_INVALID_ADDRESS),
>-      m_auxv(NULL)
>+      m_auxv()
> {
> }
> 
>
>Modified: 
>lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.
>h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoade
>r/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h?rev=179779&r1=179778&r2=179779&view=
>diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.
>h (original)
>+++ 
>lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.
>h Thu Apr 18 13:10:51 2013
>@@ -93,7 +93,7 @@ protected:
>     lldb::addr_t m_entry_point;
> 
>     /// Auxiliary vector of the inferior process.
>-    std::auto_ptr<AuxVector> m_auxv;
>+    STD_UNIQUE_PTR(AuxVector) m_auxv;
> 
>     /// Enables a breakpoint on a function called by the runtime
>     /// linker each time a module is loaded or unloaded.
>
>Modified: 
>lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/
>ARM/EmulateInstructionARM.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp 
>(original)
>+++ lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp 
>Thu Apr 18 13:10:51 2013
>@@ -193,14 +193,14 @@ EmulateInstructionARM::CreateInstance (c
>     {
>         if (arch.GetTriple().getArch() == llvm::Triple::arm)
>         {
>-            std::auto_ptr<EmulateInstructionARM> emulate_insn_ap (new 
>EmulateInstructionARM (arch));
>+            STD_UNIQUE_PTR(EmulateInstructionARM) emulate_insn_ap (new 
>EmulateInstructionARM (arch));
>             
>             if (emulate_insn_ap.get())
>                 return emulate_insn_ap.release();
>         }
>         else if (arch.GetTriple().getArch() == llvm::Triple::thumb)
>         {
>-            std::auto_ptr<EmulateInstructionARM> emulate_insn_ap (new 
>EmulateInstructionARM (arch));
>+            STD_UNIQUE_PTR(EmulateInstructionARM) emulate_insn_ap (new 
>EmulateInstructionARM (arch));
>             
>             if (emulate_insn_ap.get())
>                 return emulate_insn_ap.release();
>
>Modified: 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untime.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRunt
>ime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h?rev=179779&r1=179778&r2=17977
>9&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untime.h (original)
>+++ 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untime.h Thu Apr 18 13:10:51 2013
>@@ -104,17 +104,19 @@ protected:
>     Address *
>     GetPrintForDebuggerAddr();
>     
>-    std::auto_ptr<Address>  m_PrintForDebugger_addr;
>+    STD_UNIQUE_PTR(Address)  m_PrintForDebugger_addr;
>     bool m_read_objc_library;
>-    std::auto_ptr<lldb_private::AppleObjCTrampolineHandler> 
>m_objc_trampoline_handler_ap;
>+    STD_UNIQUE_PTR(lldb_private::AppleObjCTrampolineHandler) 
>m_objc_trampoline_handler_ap;
>     lldb::BreakpointSP m_objc_exception_bp_sp;
>     lldb::ModuleWP m_objc_module_wp;
> 
>     AppleObjCRuntime(Process *process) :
>         lldb_private::ObjCLanguageRuntime(process),
>         m_read_objc_library (false),
>-        m_objc_trampoline_handler_ap(NULL)
>-     { } // Call CreateInstance instead.
>+        m_objc_trampoline_handler_ap ()
>+     {
>+         // Call CreateInstance instead.
>+     }
> };
>     
> } // namespace lldb_private
>
>Modified: 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV1.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRunt
>ime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp?rev=179779&r1=179778&r2=1
>79779&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV1.cpp (original)
>+++ 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV1.cpp Thu Apr 18 13:10:51 2013
>@@ -150,7 +150,7 @@ struct BufStruct {
> ClangUtilityFunction *
> AppleObjCRuntimeV1::CreateObjectChecker(const char *name)
> {
>-    std::auto_ptr<BufStruct> buf(new BufStruct);
>+    STD_UNIQUE_PTR(BufStruct) buf(new BufStruct);
>     
>     assert(snprintf(&buf->contents[0], sizeof(buf->contents),
>                     "struct __objc_class                                 
>                   \n"
>
>Modified: 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV1.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRunt
>ime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h?rev=179779&r1=179778&r2=179
>779&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV1.h (original)
>+++ 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV1.h Thu Apr 18 13:10:51 2013
>@@ -184,7 +184,7 @@ protected:
>     
>     HashTableSignature m_hash_signature;
>     lldb::addr_t m_isa_hash_table_ptr;
>-    std::auto_ptr<TypeVendor> m_type_vendor_ap;
>+    STD_UNIQUE_PTR(TypeVendor) m_type_vendor_ap;
> private:
>     AppleObjCRuntimeV1(Process *process);
> };
>
>Modified: 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV2.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRunt
>ime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp?rev=179779&r1=179778&r2=1
>79779&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV2.cpp (original)
>+++ 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV2.cpp Thu Apr 18 13:10:51 2013
>@@ -11,7 +11,6 @@
> 
> #include <string>
> #include <vector>
>-#include <memory>
> #include <stdint.h>
> 
> #include "lldb/lldb-enumerations.h"
>@@ -309,6 +308,10 @@ AppleObjCRuntimeV2::AppleObjCRuntimeV2 (
>     m_has_object_getClass = 
>(objc_module_sp->FindFirstSymbolWithNameAndType(g_gdb_object_getClass, 
>eSymbolTypeCode) != NULL);
> }
> 
>+AppleObjCRuntimeV2::~AppleObjCRuntimeV2()
>+{
>+}
>+
> bool
> AppleObjCRuntimeV2::GetDynamicTypeAndAddress (ValueObject &in_value, 
>                                               DynamicValueType 
>use_dynamic, 
>@@ -817,9 +820,9 @@ public:
> 
>             if (process)
>             {
>-                std::auto_ptr<objc_class_t> objc_class;
>-                std::auto_ptr<class_ro_t> class_ro;
>-                std::auto_ptr<class_rw_t> class_rw;
>+                STD_UNIQUE_PTR(objc_class_t) objc_class;
>+                STD_UNIQUE_PTR(class_ro_t) class_ro;
>+                STD_UNIQUE_PTR(class_rw_t) class_rw;
>                 
>                 if (!Read_objc_class(process, objc_class))
>                     return m_name;
>@@ -840,7 +843,7 @@ public:
>         if (!process)
>             return ObjCLanguageRuntime::ClassDescriptorSP();
>         
>-        std::auto_ptr<objc_class_t> objc_class;
>+        STD_UNIQUE_PTR(objc_class_t) objc_class;
> 
>         if (!Read_objc_class(process, objc_class))
>             return ObjCLanguageRuntime::ClassDescriptorSP();
>@@ -869,9 +872,9 @@ public:
>         
>         if (process)
>         {
>-            std::auto_ptr<objc_class_t> objc_class;
>-            std::auto_ptr<class_ro_t> class_ro;
>-            std::auto_ptr<class_rw_t> class_rw;
>+            STD_UNIQUE_PTR(objc_class_t) objc_class;
>+            STD_UNIQUE_PTR(class_ro_t) class_ro;
>+            STD_UNIQUE_PTR(class_rw_t) class_rw;
>             
>             if (!Read_objc_class(process, objc_class))
>                 return 0;
>@@ -898,9 +901,9 @@ public:
>     {
>         lldb_private::Process *process = m_runtime.GetProcess();
> 
>-        std::auto_ptr<objc_class_t> objc_class;
>-        std::auto_ptr<class_ro_t> class_ro;
>-        std::auto_ptr<class_rw_t> class_rw;
>+        STD_UNIQUE_PTR(objc_class_t) objc_class;
>+        STD_UNIQUE_PTR(class_ro_t) class_ro;
>+        STD_UNIQUE_PTR(class_rw_t) class_rw;
>         
>         if (!Read_objc_class(process, objc_class))
>             return 0;
>@@ -914,7 +917,7 @@ public:
>         
>         if (instance_method_func)
>         {
>-            std::auto_ptr <method_list_t> base_method_list;
>+            STD_UNIQUE_PTR(method_list_t) base_method_list;
>             
>             base_method_list.reset(new method_list_t);
>             if (!base_method_list->Read(process, 
>class_ro->m_baseMethods_ptr))
>@@ -923,7 +926,7 @@ public:
>             if (base_method_list->m_entsize != 
>method_t::GetSize(process))
>                 return false;
>             
>-            std::auto_ptr <method_t> method;
>+            STD_UNIQUE_PTR(method_t) method;
>             method.reset(new method_t);
>             
>             for (uint32_t i = 0, e = base_method_list->m_count; i < e; 
>++i)
>@@ -950,23 +953,20 @@ public:
>         
>         if (ivar_func)
>         {
>-            std::auto_ptr <ivar_list_t> ivar_list;
>-            
>-            ivar_list.reset(new ivar_list_t);
>-            if (!ivar_list->Read(process, class_ro->m_ivars_ptr))
>+            ivar_list_t ivar_list;
>+            if (!ivar_list.Read(process, class_ro->m_ivars_ptr))
>                 return false;
>             
>-            if (ivar_list->m_entsize != ivar_t::GetSize(process))
>+            if (ivar_list.m_entsize != ivar_t::GetSize(process))
>                 return false;
>             
>-            std::auto_ptr <ivar_t> ivar;
>-            ivar.reset(new ivar_t);
>+            ivar_t ivar;
>             
>-            for (uint32_t i = 0, e = ivar_list->m_count; i < e; ++i)
>+            for (uint32_t i = 0, e = ivar_list.m_count; i < e; ++i)
>             {
>-                ivar->Read(process, ivar_list->m_first_ptr + (i * 
>ivar_list->m_entsize));
>+                ivar.Read(process, ivar_list.m_first_ptr + (i * 
>ivar_list.m_entsize));
>                 
>-                if (ivar_func(ivar->m_name.c_str(), 
>ivar->m_type.c_str(), ivar->m_offset_ptr, ivar->m_size))
>+                if (ivar_func(ivar.m_name.c_str(), ivar.m_type.c_str(), 
>ivar.m_offset_ptr, ivar.m_size))
>                     break;
>             }
>         }
>@@ -1354,7 +1354,7 @@ private:
>         }
>     };
>     
>-    bool Read_objc_class (Process* process, std::auto_ptr<objc_class_t> 
>&objc_class)
>+    bool Read_objc_class (Process* process, STD_UNIQUE_PTR(objc_class_t) 
>&objc_class)
>     {
>         objc_class.reset(new objc_class_t);
>         
>@@ -1366,7 +1366,7 @@ private:
>         return ret;
>     }
>     
>-    bool Read_class_row (Process* process, const objc_class_t 
>&objc_class, std::auto_ptr<class_ro_t> &class_ro, 
>std::auto_ptr<class_rw_t> &class_rw)
>+    bool Read_class_row (Process* process, const objc_class_t 
>&objc_class, STD_UNIQUE_PTR(class_ro_t) &class_ro, 
>STD_UNIQUE_PTR(class_rw_t) &class_rw)
>     {
>         class_ro.reset();
>         class_rw.reset();
>
>Modified: 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV2.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRunt
>ime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h?rev=179779&r1=179778&r2=179
>779&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV2.h (original)
>+++ 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCR
>untimeV2.h Thu Apr 18 13:10:51 2013
>@@ -29,7 +29,7 @@ class AppleObjCRuntimeV2 :
>         public AppleObjCRuntime
> {
> public:
>-    virtual ~AppleObjCRuntimeV2() { }
>+    virtual ~AppleObjCRuntimeV2();
>     
>     // These are generic runtime functions:
>     virtual bool
>@@ -150,17 +150,17 @@ private:
>     lldb::addr_t
>     GetSharedCacheReadOnlyAddress();
>     
>-    std::auto_ptr<ClangFunction>        m_get_class_info_function;
>-    std::auto_ptr<ClangUtilityFunction> m_get_class_info_code;
>+    STD_UNIQUE_PTR(ClangFunction)       m_get_class_info_function;
>+    STD_UNIQUE_PTR(ClangUtilityFunction) m_get_class_info_code;
>     lldb::addr_t                        m_get_class_info_args;
>     Mutex                               m_get_class_info_args_mutex;
> 
>-    std::auto_ptr<ClangFunction>        
>m_get_shared_cache_class_info_function;
>-    std::auto_ptr<ClangUtilityFunction> 
>m_get_shared_cache_class_info_code;
>+    STD_UNIQUE_PTR(ClangFunction)        
>m_get_shared_cache_class_info_function;
>+    STD_UNIQUE_PTR(ClangUtilityFunction) 
>m_get_shared_cache_class_info_code;
>     lldb::addr_t                        
>m_get_shared_cache_class_info_args;
>     Mutex                               
>m_get_shared_cache_class_info_args_mutex;
> 
>-    std::auto_ptr<TypeVendor>           m_type_vendor_ap;
>+    STD_UNIQUE_PTR(TypeVendor)           m_type_vendor_ap;
>     lldb::addr_t                        m_isa_hash_table_ptr;
>     HashTableSignature                  m_hash_signature;
>     bool                                m_has_object_getClass;
>
>Modified: 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCT
>rampolineHandler.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRunt
>ime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h?rev=179779&r1=17977
>8&r2=179779&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCT
>rampolineHandler.h (original)
>+++ 
>lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCT
>rampolineHandler.h Thu Apr 18 13:10:51 2013
>@@ -197,14 +197,14 @@ private:
>     MsgsendMap m_msgSend_map;
>     lldb::ProcessSP m_process_sp;
>     lldb::ModuleSP m_objc_module_sp;
>-    std::auto_ptr<ClangFunction> m_impl_function;
>-    std::auto_ptr<ClangUtilityFunction> m_impl_code;
>+    STD_UNIQUE_PTR(ClangFunction) m_impl_function;
>+    STD_UNIQUE_PTR(ClangUtilityFunction) m_impl_code;
>     Mutex m_impl_function_mutex;
>     lldb::addr_t m_impl_fn_addr;
>     lldb::addr_t m_impl_stret_fn_addr;
>     lldb::addr_t m_msg_forward_addr;
>     lldb::addr_t m_msg_forward_stret_addr;
>-    std::auto_ptr<AppleObjCVTables> m_vtables_ap;
>+    STD_UNIQUE_PTR(AppleObjCVTables) m_vtables_ap;
>     
>      
> };
>
>Modified: 
>lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDAr
>chive.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContai
>ner/BSD-Archive/ObjectContainerBSDArchive.cpp?rev=179779&r1=179778&r2=1797
>79&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDAr
>chive.cpp (original)
>+++ 
>lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDAr
>chive.cpp Thu Apr 18 13:10:51 2013
>@@ -296,12 +296,12 @@ ObjectContainerBSDArchive::CreateInstanc
>                 lldb::offset_t archive_data_offset = 0;
> 
>                 Archive::shared_ptr archive_sp 
>(Archive::FindCachedArchive (*file, module_sp->GetArchitecture(), 
>module_sp->GetModificationTime()));
>-                std::auto_ptr<ObjectContainerBSDArchive> 
>container_ap(new ObjectContainerBSDArchive (module_sp,
>-                                                                         
>                            archive_data_sp,
>-                                                                         
>                            archive_data_offset,
>-                                                                         
>                            file,
>-                                                                         
>                            file_offset,
>-                                                                         
>                            length));
>+                STD_UNIQUE_PTR(ObjectContainerBSDArchive) 
>container_ap(new ObjectContainerBSDArchive (module_sp,
>+                                                                         
>                             archive_data_sp,
>+                                                                         
>                             archive_data_offset,
>+                                                                         
>                             file,
>+                                                                         
>                             file_offset,
>+                                                                         
>                             length));
> 
>                 if (container_ap.get())
>                 {
>@@ -322,7 +322,7 @@ ObjectContainerBSDArchive::CreateInstanc
>             Archive::shared_ptr archive_sp (Archive::FindCachedArchive 
>(*file, module_sp->GetArchitecture(), module_sp->GetModificationTime()));
>             if (archive_sp)
>             {
>-                std::auto_ptr<ObjectContainerBSDArchive> 
>container_ap(new ObjectContainerBSDArchive (module_sp, data_sp, 
>data_offset, file, file_offset, length));
>+                STD_UNIQUE_PTR(ObjectContainerBSDArchive) 
>container_ap(new ObjectContainerBSDArchive (module_sp, data_sp, 
>data_offset, file, file_offset, length));
>                 
>                 if (container_ap.get())
>                 {
>
>Modified: 
>lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainer
>UniversalMachO.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContai
>ner/Universal-Mach-O/ObjectContainerUniversalMachO.cpp?rev=179779&r1=17977
>8&r2=179779&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainer
>UniversalMachO.cpp (original)
>+++ 
>lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainer
>UniversalMachO.cpp Thu Apr 18 13:10:51 2013
>@@ -67,7 +67,7 @@ ObjectContainerUniversalMachO::CreateIns
>         data.SetData (data_sp, data_offset, length);
>         if (ObjectContainerUniversalMachO::MagicBytesMatch(data))
>         {
>-            std::auto_ptr<ObjectContainerUniversalMachO> 
>container_ap(new ObjectContainerUniversalMachO (module_sp, data_sp, 
>data_offset, file, file_offset, length));
>+            STD_UNIQUE_PTR(ObjectContainerUniversalMachO) 
>container_ap(new ObjectContainerUniversalMachO (module_sp, data_sp, 
>data_offset, file, file_offset, length));
>             if (container_ap->ParseHeader())
>             {
>                 return container_ap.release();
>
>Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/E
>LF/ObjectFileELF.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original)
>+++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Thu Apr 18 
>13:10:51 2013
>@@ -198,7 +198,7 @@ ObjectFileELF::CreateInstance (const lld
>             unsigned address_size = ELFHeader::AddressSizeInBytes(magic);
>             if (address_size == 4 || address_size == 8)
>             {
>-                std::auto_ptr<ObjectFileELF> objfile_ap(new 
>ObjectFileELF(module_sp, data_sp, data_offset, file, file_offset, 
>length));
>+                STD_UNIQUE_PTR(ObjectFileELF) objfile_ap(new 
>ObjectFileELF(module_sp, data_sp, data_offset, file, file_offset, 
>length));
>                 ArchSpec spec;
>                 if (objfile_ap->GetArchitecture(spec) &&
>                     objfile_ap->SetModulesArchitecture(spec))
>
>Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/E
>LF/ObjectFileELF.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h (original)
>+++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h Thu Apr 18 
>13:10:51 2013
>@@ -155,7 +155,7 @@ private:
> 
>     /// List of file specifications corresponding to the modules (shared
>     /// libraries) on which this object file depends.
>-    mutable std::auto_ptr<lldb_private::FileSpecList> m_filespec_ap;
>+    mutable STD_UNIQUE_PTR(lldb_private::FileSpecList) m_filespec_ap;
> 
>     /// Data extractor holding the string table used to resolve section 
>names.
>     lldb_private::DataExtractor m_shstr_data;
>
>Modified: lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/M
>ach-O/ObjectFileMachO.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp 
>(original)
>+++ lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Thu 
>Apr 18 13:10:51 2013
>@@ -411,7 +411,7 @@ ObjectFileMachO::CreateInstance (const l
>             data_sp = file->MemoryMapFileContents(file_offset, length);
>             data_offset = 0;
>         }
>-        std::auto_ptr<ObjectFile> objfile_ap(new ObjectFileMachO 
>(module_sp, data_sp, data_offset, file, file_offset, length));
>+        STD_UNIQUE_PTR(ObjectFile) objfile_ap(new ObjectFileMachO 
>(module_sp, data_sp, data_offset, file, file_offset, length));
>         if (objfile_ap.get() && objfile_ap->ParseHeader())
>             return objfile_ap.release();
>     }
>@@ -426,7 +426,7 @@ ObjectFileMachO::CreateMemoryInstance (c
> {
>     if (ObjectFileMachO::MagicBytesMatch(data_sp, 0, 
>data_sp->GetByteSize()))
>     {
>-        std::auto_ptr<ObjectFile> objfile_ap(new ObjectFileMachO 
>(module_sp, data_sp, process_sp, header_addr));
>+        STD_UNIQUE_PTR(ObjectFile) objfile_ap(new ObjectFileMachO 
>(module_sp, data_sp, process_sp, header_addr));
>         if (objfile_ap.get() && objfile_ap->ParseHeader())
>             return objfile_ap.release();
>     }
>
>Modified: lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/P
>ECOFF/ObjectFilePECOFF.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp 
>(original)
>+++ lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp Thu 
>Apr 18 13:10:51 2013
>@@ -163,7 +163,7 @@ ObjectFilePECOFF::CreateInstance (const
>         // Update the data to contain the entire file if it doesn't 
>already
>         if (data_sp->GetByteSize() < length)
>             data_sp = file->MemoryMapFileContents(file_offset, length);
>-        std::auto_ptr<ObjectFile> objfile_ap(new ObjectFilePECOFF 
>(module_sp, data_sp, data_offset, file, file_offset, length));
>+        STD_UNIQUE_PTR(ObjectFile) objfile_ap(new ObjectFilePECOFF 
>(module_sp, data_sp, data_offset, file, file_offset, length));
>         if (objfile_ap.get() && objfile_ap->ParseHeader())
>             return objfile_ap.release();
>     }
>
>Modified: 
>lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDar
>winKernel.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/OperatingSys
>tem/Darwin-Kernel/OperatingSystemDarwinKernel.h?rev=179779&r1=179778&r2=17
>9779&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDar
>winKernel.h (original)
>+++ 
>lldb/trunk/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDar
>winKernel.h Thu Apr 18 13:10:51 2013
>@@ -84,7 +84,7 @@ protected:
>     GetDynamicRegisterInfo ();
> 
>     lldb::ValueObjectSP m_thread_list_valobj_sp;
>-    std::auto_ptr<DynamicRegisterInfo> m_register_info_ap;
>+    STD_UNIQUE_PTR(DynamicRegisterInfo) m_register_info_ap;
>     
> };
> 
>
>Modified: 
>lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/OperatingSys
>tem/Python/OperatingSystemPython.cpp?rev=179779&r1=179778&r2=179779&view=d
>iff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
> (original)
>+++ 
>lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
> Thu Apr 18 13:10:51 2013
>@@ -60,7 +60,7 @@ OperatingSystemPython::CreateInstance (P
>     FileSpec python_os_plugin_spec (process->GetPythonOSPluginPath());
>     if (python_os_plugin_spec && python_os_plugin_spec.Exists())
>     {
>-        std::auto_ptr<OperatingSystemPython> os_ap (new 
>OperatingSystemPython (process, python_os_plugin_spec));
>+        STD_UNIQUE_PTR(OperatingSystemPython) os_ap (new 
>OperatingSystemPython (process, python_os_plugin_spec));
>         if (os_ap.get() && os_ap->IsValid())
>             return os_ap.release();
>     }
>
>Modified: 
>lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/OperatingSys
>tem/Python/OperatingSystemPython.h?rev=179779&r1=179778&r2=179779&view=dif
>f
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h 
>(original)
>+++ 
>lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h 
>Thu Apr 18 13:10:51 2013
>@@ -101,7 +101,7 @@ protected:
>     GetDynamicRegisterInfo ();
> 
>     lldb::ValueObjectSP m_thread_list_valobj_sp;
>-    std::auto_ptr<DynamicRegisterInfo> m_register_info_ap;
>+    STD_UNIQUE_PTR(DynamicRegisterInfo) m_register_info_ap;
>     lldb_private::ScriptInterpreter *m_interpreter;
>     lldb::ScriptInterpreterObjectSP m_python_object_sp;
>     
>
>Modified: lldb/trunk/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Free
>BSD/ProcessMonitor.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp 
>(original)
>+++ lldb/trunk/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp Thu Apr 
>18 13:10:51 2013
>@@ -691,7 +691,7 @@ ProcessMonitor::ProcessMonitor(ProcessPO
>       m_client_fd(-1),
>       m_server_fd(-1)
> {
>-    std::auto_ptr<LaunchArgs> args;
>+    STD_UNIQUE_PTR(LaunchArgs) args;
> 
>     args.reset(new LaunchArgs(this, module, argv, envp,
>                               stdin_path, stdout_path, stderr_path, 
>working_dir));
>@@ -752,7 +752,7 @@ ProcessMonitor::ProcessMonitor(ProcessPO
>       m_client_fd(-1),
>       m_server_fd(-1)
> {
>-    std::auto_ptr<AttachArgs> args;
>+    STD_UNIQUE_PTR(AttachArgs) args;
> 
>     args.reset(new AttachArgs(this, pid));
> 
>
>Modified: lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linu
>x/ProcessMonitor.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp (original)
>+++ lldb/trunk/source/Plugins/Process/Linux/ProcessMonitor.cpp Thu Apr 18 
>13:10:51 2013
>@@ -924,7 +924,7 @@ ProcessMonitor::ProcessMonitor(ProcessPO
>       m_client_fd(-1),
>       m_server_fd(-1)
> {
>-    std::auto_ptr<LaunchArgs> args;
>+    STD_UNIQUE_PTR(LaunchArgs) args;
> 
>     args.reset(new LaunchArgs(this, module, argv, envp,
>                               stdin_path, stdout_path, stderr_path, 
>working_dir));
>@@ -984,7 +984,7 @@ ProcessMonitor::ProcessMonitor(ProcessPO
>       m_client_fd(-1),
>       m_server_fd(-1)
> {
>-    std::auto_ptr<AttachArgs> args;
>+    STD_UNIQUE_PTR(AttachArgs) args;
> 
>     args.reset(new AttachArgs(this, pid));
> 
>
>Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacO
>SX-Kernel/ProcessKDP.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp 
>(original)
>+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp Thu 
>Apr 18 13:10:51 2013
>@@ -196,7 +196,7 @@ ProcessKDP::DoConnectRemote (Stream *str
>         return error;
>     }
> 
>-    std::auto_ptr<ConnectionFileDescriptor> conn_ap(new 
>ConnectionFileDescriptor());
>+    STD_UNIQUE_PTR(ConnectionFileDescriptor) conn_ap(new 
>ConnectionFileDescriptor());
>     if (conn_ap.get())
>     {
>         // Only try once for now.
>
>Modified: lldb/trunk/source/Plugins/Process/POSIX/POSIXThread.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/POSI
>X/POSIXThread.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/Process/POSIX/POSIXThread.h (original)
>+++ lldb/trunk/source/Plugins/Process/POSIX/POSIXThread.h Thu Apr 18 
>13:10:51 2013
>@@ -81,7 +81,7 @@ private:
>         return (RegisterContextPOSIX *)m_reg_context_sp.get();
>     }
>     
>-    std::auto_ptr<lldb_private::StackFrame> m_frame_ap;
>+    STD_UNIQUE_PTR(lldb_private::StackFrame) m_frame_ap;
> 
>     lldb::BreakpointSiteSP m_breakpoint;
>     lldb::StopInfoSP m_stop_info;
>
>Modified: 
>lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-
>remote/ProcessGDBRemote.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp 
>(original)
>+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Thu 
>Apr 18 13:10:51 2013
>@@ -738,7 +738,7 @@ ProcessGDBRemote::ConnectToDebugserver (
> {
>     Error error;
>     // Sleep and wait a bit for debugserver to start to listen...
>-    std::auto_ptr<ConnectionFileDescriptor> conn_ap(new 
>ConnectionFileDescriptor());
>+    STD_UNIQUE_PTR(ConnectionFileDescriptor) conn_ap(new 
>ConnectionFileDescriptor());
>     if (conn_ap.get())
>     {
>         const uint32_t max_retry_count = 50;
>
>Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/D
>WARF/DWARFCompileUnit.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h 
>(original)
>+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h Thu Apr 
>18 13:10:51 2013
>@@ -190,7 +190,7 @@ protected:
>     const DWARFAbbreviationDeclarationSet *m_abbrevs;
>     void *              m_user_data;
>     DWARFDebugInfoEntry::collection m_die_array;    // The compile unit 
>debug information entry item
>-    std::auto_ptr<DWARFDebugAranges> m_func_aranges_ap;   // A table 
>similar to the .debug_aranges table, but this one points to the exact 
>DW_TAG_subprogram DIEs
>+    STD_UNIQUE_PTR(DWARFDebugAranges) m_func_aranges_ap;   // A table 
>similar to the .debug_aranges table, but this one points to the exact 
>DW_TAG_subprogram DIEs
>     dw_addr_t           m_base_addr;
>     dw_offset_t         m_offset;
>     uint32_t            m_length;
>
>Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/D
>WARF/DWARFDebugInfo.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h (original)
>+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h Thu Apr 
>18 13:10:51 2013
>@@ -77,7 +77,7 @@ protected:
>     SymbolFileDWARF* m_dwarf2Data;
>     typedef std::vector<DWARFCompileUnitSP>     CompileUnitColl;
>     CompileUnitColl m_compile_units;
>-    std::auto_ptr<DWARFDebugAranges> m_cu_aranges_ap; // A quick address 
>to compile unit table
>+    STD_UNIQUE_PTR(DWARFDebugAranges) m_cu_aranges_ap; // A quick 
>address to compile unit table
> 
> private:
>     // All parsing needs to be done partially any managed by this class 
>as accessors are called.
>
>Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/D
>WARF/SymbolFileDWARF.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp 
>(original)
>+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Thu 
>Apr 18 13:10:51 2013
>@@ -880,7 +880,7 @@ SymbolFileDWARF::ParseCompileUnitFunctio
>                 func_name.SetValue(ConstString(name), false);
> 
>             FunctionSP func_sp;
>-            std::auto_ptr<Declaration> decl_ap;
>+            STD_UNIQUE_PTR(Declaration) decl_ap;
>             if (decl_file != 0 || decl_line != 0 || decl_column != 0)
>                 decl_ap.reset(new Declaration 
>(sc.comp_unit->GetSupportFiles().GetFileSpecAtIndex(decl_file), 
>                                                decl_line, 
>@@ -995,7 +995,7 @@ SymbolFileDWARF::ParseCompileUnitSupport
> struct ParseDWARFLineTableCallbackInfo
> {
>     LineTable* line_table;
>-    std::auto_ptr<LineSequence> sequence_ap;
>+    STD_UNIQUE_PTR(LineSequence) sequence_ap;
> };
> 
> //----------------------------------------------------------------------
>@@ -1060,7 +1060,7 @@ SymbolFileDWARF::ParseCompileUnitLineTab
>             const dw_offset_t cu_line_offset = 
>dwarf_cu_die->GetAttributeValueAsUnsigned(this, dwarf_cu, 
>DW_AT_stmt_list, DW_INVALID_OFFSET);
>             if (cu_line_offset != DW_INVALID_OFFSET)
>             {
>-                std::auto_ptr<LineTable> line_table_ap(new 
>LineTable(sc.comp_unit));
>+                STD_UNIQUE_PTR(LineTable) line_table_ap(new 
>LineTable(sc.comp_unit));
>                 if (line_table_ap.get())
>                 {
>                     ParseDWARFLineTableCallbackInfo info;
>@@ -1170,12 +1170,12 @@ SymbolFileDWARF::ParseFunctionBlocks
> 
>                     if (tag != DW_TAG_subprogram && (name != NULL || 
>mangled_name != NULL))
>                     {
>-                        std::auto_ptr<Declaration> decl_ap;
>+                        STD_UNIQUE_PTR(Declaration) decl_ap;
>                         if (decl_file != 0 || decl_line != 0 || 
>decl_column != 0)
>                             decl_ap.reset(new 
>Declaration(sc.comp_unit->GetSupportFiles().GetFileSpecAtIndex(decl_file),
> 
>                                                           decl_line, 
>decl_column));
> 
>-                        std::auto_ptr<Declaration> call_ap;
>+                        STD_UNIQUE_PTR(Declaration) call_ap;
>                         if (call_file != 0 || call_line != 0 || 
>call_column != 0)
>                             call_ap.reset(new 
>Declaration(sc.comp_unit->GetSupportFiles().GetFileSpecAtIndex(call_file),
> 
>                                                           call_line, 
>call_column));
>@@ -1435,7 +1435,7 @@ private:
>     const char             *m_property_setter_name;
>     const char             *m_property_getter_name;
>     uint32_t                m_property_attributes;
>-    std::auto_ptr<ClangASTMetadata> m_metadata_ap;
>+    STD_UNIQUE_PTR(ClangASTMetadata) m_metadata_ap;
> };
> 
> struct BitfieldInfo
>
>Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/D
>WARF/SymbolFileDWARF.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h 
>(original)
>+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Thu Apr 
>18 13:10:51 2013
>@@ -13,7 +13,6 @@
> // C Includes
> // C++ Includes
> #include <list>
>-#include <memory>
> #include <map>
> #include <vector>
> 
>@@ -567,15 +566,15 @@ protected:
>     lldb_private::DataExtractor     m_data_apple_namespaces;
>     lldb_private::DataExtractor     m_data_apple_objc;
> 
>-    // The auto_ptr items below are generated on demand if and when 
>someone accesses
>+    // The unique pointer items below are generated on demand if and 
>when someone accesses
>     // them through a non const version of this class.
>-    std::auto_ptr<DWARFDebugAbbrev>     m_abbr;
>-    std::auto_ptr<DWARFDebugInfo>       m_info;
>-    std::auto_ptr<DWARFDebugLine>       m_line;
>-    std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_names_ap;
>-    std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_types_ap;
>-    std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_namespaces_ap;
>-    std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_objc_ap;
>+    STD_UNIQUE_PTR(DWARFDebugAbbrev)     m_abbr;
>+    STD_UNIQUE_PTR(DWARFDebugInfo)       m_info;
>+    STD_UNIQUE_PTR(DWARFDebugLine)       m_line;
>+    STD_UNIQUE_PTR(DWARFMappedHash::MemoryTable) m_apple_names_ap;
>+    STD_UNIQUE_PTR(DWARFMappedHash::MemoryTable) m_apple_types_ap;
>+    STD_UNIQUE_PTR(DWARFMappedHash::MemoryTable) m_apple_namespaces_ap;
>+    STD_UNIQUE_PTR(DWARFMappedHash::MemoryTable) m_apple_objc_ap;
>     NameToDIE                           m_function_basename_index;  // 
>All concrete functions
>     NameToDIE                           m_function_fullname_index;  // 
>All concrete functions
>     NameToDIE                           m_function_method_index;    // 
>All inlined functions
>@@ -589,7 +588,7 @@ protected:
>                                         m_using_apple_tables:1;
>     lldb_private::LazyBool              
>m_supports_DW_AT_APPLE_objc_complete_type;
> 
>-    std::auto_ptr<DWARFDebugRanges>     m_ranges;
>+    STD_UNIQUE_PTR(DWARFDebugRanges)     m_ranges;
>     UniqueDWARFASTTypeMap m_unique_ast_type_map;
>     typedef llvm::SmallPtrSet<const DWARFDebugInfoEntry *, 4> 
>DIEPointerSet;
>     typedef llvm::DenseMap<const DWARFDebugInfoEntry *, 
>clang::DeclContext *> DIEToDeclContextMap;
>
>Modified: 
>lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstE
>mulation.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssemb
>ly/InstEmulation/UnwindAssemblyInstEmulation.cpp?rev=179779&r1=179778&r2=1
>79779&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstE
>mulation.cpp (original)
>+++ 
>lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstE
>mulation.cpp Thu Apr 18 13:10:51 2013
>@@ -298,7 +298,7 @@ UnwindAssemblyInstEmulation::FirstNonPro
> UnwindAssembly *
> UnwindAssemblyInstEmulation::CreateInstance (const ArchSpec &arch)
> {
>-    std::auto_ptr<EmulateInstruction> inst_emulator_ap 
>(EmulateInstruction::FindPlugin (arch, eInstructionTypePrologueEpilogue, 
>NULL));
>+    STD_UNIQUE_PTR(EmulateInstruction) inst_emulator_ap 
>(EmulateInstruction::FindPlugin (arch, eInstructionTypePrologueEpilogue, 
>NULL));
>     // Make sure that all prologue instructions are handled
>     if (inst_emulator_ap.get())
>         return new UnwindAssemblyInstEmulation (arch, 
>inst_emulator_ap.release());
>
>Modified: 
>lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstE
>mulation.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssemb
>ly/InstEmulation/UnwindAssemblyInstEmulation.h?rev=179779&r1=179778&r2=179
>779&view=diff
>==========================================================================
>====
>--- 
>lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstE
>mulation.h (original)
>+++ 
>lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstE
>mulation.h Thu Apr 18 13:10:51 2013
>@@ -160,7 +160,7 @@ private:
>     GetRegisterValue (const lldb_private::RegisterInfo &reg_info, 
>                       lldb_private::RegisterValue &reg_value);
> 
>-    std::auto_ptr<lldb_private::EmulateInstruction> m_inst_emulator_ap;  
>  
>+    STD_UNIQUE_PTR(lldb_private::EmulateInstruction) m_inst_emulator_ap; 
>   
>     lldb_private::AddressRange* m_range_ptr; 
>     lldb_private::Thread* m_thread_ptr;
>     lldb_private::UnwindPlan* m_unwind_plan_ptr;
>
>Modified: lldb/trunk/source/Symbol/FuncUnwinders.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/FuncUnwinders
>.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Symbol/FuncUnwinders.cpp (original)
>+++ lldb/trunk/source/Symbol/FuncUnwinders.cpp Thu Apr 18 13:10:51 2013
>@@ -102,8 +102,8 @@ FuncUnwinders::GetUnwindPlanAtNonCallSit
>     // information. We want to make sure if someone requests an unwind
>     // plan, that they get one and don't run into a race condition where 
>one
>     // thread has started to create the unwind plan and has put it into 
>-    // the auto_ptr member variable, and have another thread enter this 
>function
>-    // and return the partially filled pointer contained in the auto_ptr.
>+    // the unique pointer member variable, and have another thread enter 
>this function
>+    // and return the partially filled pointer contained in the unique 
>pointer.
>     // We also want to make sure that we lock out other unwind plans from
>     // being accessed until this one is done creating itself in case 
>someone
>     // had some code like:
>@@ -128,8 +128,8 @@ FuncUnwinders::GetUnwindPlanFastUnwind (
>     // information. We want to make sure if someone requests an unwind
>     // plan, that they get one and don't run into a race condition where 
>one
>     // thread has started to create the unwind plan and has put it into 
>-    // the auto_ptr member variable, and have another thread enter this 
>function
>-    // and return the partially filled pointer contained in the auto_ptr.
>+    // the unique pointer member variable, and have another thread enter 
>this function
>+    // and return the partially filled pointer contained in the unique 
>pointer.
>     // We also want to make sure that we lock out other unwind plans from
>     // being accessed until this one is done creating itself in case 
>someone
>     // had some code like:
>@@ -154,8 +154,8 @@ FuncUnwinders::GetUnwindPlanArchitecture
>     // information. We want to make sure if someone requests an unwind
>     // plan, that they get one and don't run into a race condition where 
>one
>     // thread has started to create the unwind plan and has put it into 
>-    // the auto_ptr member variable, and have another thread enter this 
>function
>-    // and return the partially filled pointer contained in the auto_ptr.
>+    // the unique pointer member variable, and have another thread enter 
>this function
>+    // and return the partially filled pointer contained in the unique 
>pointer.
>     // We also want to make sure that we lock out other unwind plans from
>     // being accessed until this one is done creating itself in case 
>someone
>     // had some code like:
>@@ -190,8 +190,8 @@ FuncUnwinders::GetUnwindPlanArchitecture
>     // information. We want to make sure if someone requests an unwind
>     // plan, that they get one and don't run into a race condition where 
>one
>     // thread has started to create the unwind plan and has put it into 
>-    // the auto_ptr member variable, and have another thread enter this 
>function
>-    // and return the partially filled pointer contained in the auto_ptr.
>+    // the unique pointer member variable, and have another thread enter 
>this function
>+    // and return the partially filled pointer contained in the unique 
>pointer.
>     // We also want to make sure that we lock out other unwind plans from
>     // being accessed until this one is done creating itself in case 
>someone
>     // had some code like:
>
>Modified: lldb/trunk/source/Symbol/LineTable.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/LineTable.cpp
>?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Symbol/LineTable.cpp (original)
>+++ lldb/trunk/source/Symbol/LineTable.cpp Thu Apr 18 13:10:51 2013
>@@ -489,7 +489,7 @@ LineTable::GetContiguousFileAddressRange
> LineTable *
> LineTable::LinkLineTable (const FileRangeMap &file_range_map)
> {
>-    std::auto_ptr<LineTable> line_table_ap (new LineTable (m_comp_unit));
>+    STD_UNIQUE_PTR(LineTable) line_table_ap (new LineTable 
>(m_comp_unit));
>     LineSequenceImpl sequence;
>     const size_t count = m_entries.size();
>     LineEntry line_entry;
>
>Modified: lldb/trunk/source/Symbol/ObjectFile.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ObjectFile.cp
>p?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Symbol/ObjectFile.cpp (original)
>+++ lldb/trunk/source/Symbol/ObjectFile.cpp Thu Apr 18 13:10:51 2013
>@@ -59,7 +59,7 @@ ObjectFile::FindPlugin (const lldb::Modu
>                 {
>                     for (uint32_t idx = 0; 
>(create_object_container_callback = 
>PluginManager::GetObjectContainerCreateCallbackAtIndex(idx)) != NULL; 
>++idx)
>                     {
>-                        std::auto_ptr<ObjectContainer> 
>object_container_ap(create_object_container_callback(module_sp, data_sp, 
>data_offset, file, file_offset, file_size));
>+                        STD_UNIQUE_PTR(ObjectContainer) 
>object_container_ap(create_object_container_callback(module_sp, data_sp, 
>data_offset, file, file_offset, file_size));
>                         
>                         if (object_container_ap.get())
>                             object_file_sp = 
>object_container_ap->GetObjectFile(file);
>@@ -101,7 +101,7 @@ ObjectFile::FindPlugin (const lldb::Modu
>                         // (like BSD archives caching the contained 
>objects within an file).
>                         for (uint32_t idx = 0; 
>(create_object_container_callback = 
>PluginManager::GetObjectContainerCreateCallbackAtIndex(idx)) != NULL; 
>++idx)
>                         {
>-                            std::auto_ptr<ObjectContainer> 
>object_container_ap(create_object_container_callback(module_sp, data_sp, 
>data_offset, file, file_offset, file_size));
>+                            STD_UNIQUE_PTR(ObjectContainer) 
>object_container_ap(create_object_container_callback(module_sp, data_sp, 
>data_offset, file, file_offset, file_size));
>                             
>                             if (object_container_ap.get())
>                                 object_file_sp = 
>object_container_ap->GetObjectFile(file);
>@@ -133,7 +133,7 @@ ObjectFile::FindPlugin (const lldb::Modu
>                 // an object file from the container.
>                 for (uint32_t idx = 0; (create_object_container_callback 
>= PluginManager::GetObjectContainerCreateCallbackAtIndex(idx)) != NULL; 
>++idx)
>                 {
>-                    std::auto_ptr<ObjectContainer> 
>object_container_ap(create_object_container_callback(module_sp, data_sp, 
>data_offset, file, file_offset, file_size));
>+                    STD_UNIQUE_PTR(ObjectContainer) 
>object_container_ap(create_object_container_callback(module_sp, data_sp, 
>data_offset, file, file_offset, file_size));
> 
>                     if (object_container_ap.get())
>                         object_file_sp = 
>object_container_ap->GetObjectFile(file);
>@@ -392,7 +392,7 @@ ObjectFile::ReadMemory (const ProcessSP
>     DataBufferSP data_sp;
>     if (process_sp)
>     {
>-        std::auto_ptr<DataBufferHeap> data_ap (new DataBufferHeap 
>(byte_size, 0));
>+        STD_UNIQUE_PTR(DataBufferHeap) data_ap (new DataBufferHeap 
>(byte_size, 0));
>         Error error;
>         const size_t bytes_read = process_sp->ReadMemory (addr, 
>                                                           
>data_ap->GetBytes(), 
>
>Modified: lldb/trunk/source/Symbol/SymbolFile.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/SymbolFile.cp
>p?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Symbol/SymbolFile.cpp (original)
>+++ lldb/trunk/source/Symbol/SymbolFile.cpp Thu Apr 18 13:10:51 2013
>@@ -21,7 +21,7 @@ using namespace lldb_private;
> SymbolFile*
> SymbolFile::FindPlugin (ObjectFile* obj_file)
> {
>-    std::auto_ptr<SymbolFile> best_symfile_ap;
>+    STD_UNIQUE_PTR(SymbolFile) best_symfile_ap;
>     if (obj_file != NULL)
>     {
>         // TODO: Load any plug-ins in the appropriate plug-in search 
>paths and
>@@ -32,7 +32,7 @@ SymbolFile::FindPlugin (ObjectFile* obj_
>         SymbolFileCreateInstance create_callback;
>         for (uint32_t idx = 0; (create_callback = 
>PluginManager::GetSymbolFileCreateCallbackAtIndex(idx)) != NULL; ++idx)
>         {
>-            std::auto_ptr<SymbolFile> 
>curr_symfile_ap(create_callback(obj_file));
>+            STD_UNIQUE_PTR(SymbolFile) 
>curr_symfile_ap(create_callback(obj_file));
> 
>             if (curr_symfile_ap.get())
>             {
>@@ -40,7 +40,7 @@ SymbolFile::FindPlugin (ObjectFile* obj_
>                 if (sym_file_abilities > best_symfile_abilities)
>                 {
>                     best_symfile_abilities = sym_file_abilities;
>-                    best_symfile_ap = curr_symfile_ap;
>+                    best_symfile_ap.reset (curr_symfile_ap.release());
>                     // If any symbol file parser has all of the 
>abilities, then
>                     // we should just stop looking.
>                     if ((kAllAbilities & sym_file_abilities) == 
>kAllAbilities)
>
>Modified: lldb/trunk/source/Symbol/SymbolVendor.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/SymbolVendor.
>cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Symbol/SymbolVendor.cpp (original)
>+++ lldb/trunk/source/Symbol/SymbolVendor.cpp Thu Apr 18 13:10:51 2013
>@@ -34,7 +34,7 @@ using namespace lldb_private;
> SymbolVendor*
> SymbolVendor::FindPlugin (const lldb::ModuleSP &module_sp, 
>lldb_private::Stream *feedback_strm)
> {
>-    std::auto_ptr<SymbolVendor> instance_ap;
>+    STD_UNIQUE_PTR(SymbolVendor) instance_ap;
>     
>//----------------------------------------------------------------------
>     // We currently only have one debug symbol parser...
>     
>//----------------------------------------------------------------------
>
>Modified: lldb/trunk/source/Target/LanguageRuntime.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/LanguageRunti
>me.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Target/LanguageRuntime.cpp (original)
>+++ lldb/trunk/source/Target/LanguageRuntime.cpp Thu Apr 18 13:10:51 2013
>@@ -228,7 +228,7 @@ protected:
> LanguageRuntime*
> LanguageRuntime::FindPlugin (Process *process, lldb::LanguageType 
>language)
> {
>-    std::auto_ptr<LanguageRuntime> language_runtime_ap;
>+    STD_UNIQUE_PTR(LanguageRuntime) language_runtime_ap;
>     LanguageRuntimeCreateInstance create_callback;
> 
>     for (uint32_t idx = 0;
>
>Modified: lldb/trunk/source/Target/Memory.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Memory.cpp?re
>v=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Target/Memory.cpp (original)
>+++ lldb/trunk/source/Target/Memory.cpp Thu Apr 18 13:10:51 2013
>@@ -178,7 +178,7 @@ MemoryCache::Read (addr_t addr,
>             if (bytes_left > 0)
>             {
>                 assert ((curr_addr % cache_line_byte_size) == 0);
>-                std::auto_ptr<DataBufferHeap> data_buffer_heap_ap(new 
>DataBufferHeap (cache_line_byte_size, 0));
>+                STD_UNIQUE_PTR(DataBufferHeap) data_buffer_heap_ap(new 
>DataBufferHeap (cache_line_byte_size, 0));
>                 size_t process_bytes_read = 
>m_process.ReadMemoryFromInferior (curr_addr, 
>                                                                          
>     data_buffer_heap_ap->GetBytes(), 
>                                                                          
>     data_buffer_heap_ap->GetByteSize(), 
>
>Modified: lldb/trunk/source/Target/OperatingSystem.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/OperatingSyst
>em.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Target/OperatingSystem.cpp (original)
>+++ lldb/trunk/source/Target/OperatingSystem.cpp Thu Apr 18 13:10:51 2013
>@@ -28,7 +28,7 @@ OperatingSystem::FindPlugin (Process *pr
>         create_callback  = 
>PluginManager::GetOperatingSystemCreateCallbackForPluginName 
>(plugin_name);
>         if (create_callback)
>         {
>-            std::auto_ptr<OperatingSystem> 
>instance_ap(create_callback(process, true));
>+            STD_UNIQUE_PTR(OperatingSystem) 
>instance_ap(create_callback(process, true));
>             if (instance_ap.get())
>                 return instance_ap.release();
>         }
>@@ -37,7 +37,7 @@ OperatingSystem::FindPlugin (Process *pr
>     {
>         for (uint32_t idx = 0; (create_callback = 
>PluginManager::GetOperatingSystemCreateCallbackAtIndex(idx)) != NULL; 
>++idx)
>         {
>-            std::auto_ptr<OperatingSystem> 
>instance_ap(create_callback(process, false));
>+            STD_UNIQUE_PTR(OperatingSystem) 
>instance_ap(create_callback(process, false));
>             if (instance_ap.get())
>                 return instance_ap.release();
>         }
>
>Modified: lldb/trunk/source/Target/Platform.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Platform.cpp?
>rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Target/Platform.cpp (original)
>+++ lldb/trunk/source/Target/Platform.cpp Thu Apr 18 13:10:51 2013
>@@ -109,7 +109,7 @@ Platform::FindPlugin (Process *process,
>             {
>                 arch = process->GetTarget().GetArchitecture();
>             }
>-            std::auto_ptr<Platform> instance_ap(create_callback(process, 
>&arch));
>+            STD_UNIQUE_PTR(Platform) 
>instance_ap(create_callback(process, &arch));
>             if (instance_ap.get())
>                 return instance_ap.release();
>         }
>@@ -118,7 +118,7 @@ Platform::FindPlugin (Process *process,
>     {
>         for (uint32_t idx = 0; (create_callback = 
>PluginManager::GetPlatformCreateCallbackAtIndex(idx)) != NULL; ++idx)
>         {
>-            std::auto_ptr<Platform> instance_ap(create_callback(process, 
>false));
>+            STD_UNIQUE_PTR(Platform) 
>instance_ap(create_callback(process, false));
>             if (instance_ap.get())
>                 return instance_ap.release();
>         }
>
>Modified: lldb/trunk/source/Target/Process.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?r
>ev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Target/Process.cpp (original)
>+++ lldb/trunk/source/Target/Process.cpp Thu Apr 18 13:10:51 2013
>@@ -4440,7 +4440,7 @@ Process::SetSTDIOFileDescriptor (int fil
> {
>     // First set up the Read Thread for reading/handling process I/O
>     
>-    std::auto_ptr<ConnectionFileDescriptor> conn_ap (new 
>ConnectionFileDescriptor (file_descriptor, true));
>+    STD_UNIQUE_PTR(ConnectionFileDescriptor) conn_ap (new 
>ConnectionFileDescriptor (file_descriptor, true));
>     
>     if (conn_ap.get())
>     {
>
>Modified: lldb/trunk/source/Target/StackFrameList.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrameLis
>t.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Target/StackFrameList.cpp (original)
>+++ lldb/trunk/source/Target/StackFrameList.cpp Thu Apr 18 13:10:51 2013
>@@ -717,7 +717,7 @@ StackFrameList::InvalidateFrames (uint32
> }
> 
> void
>-StackFrameList::Merge (std::auto_ptr<StackFrameList>& curr_ap, 
>lldb::StackFrameListSP& prev_sp)
>+StackFrameList::Merge (STD_UNIQUE_PTR(StackFrameList)& curr_ap, 
>lldb::StackFrameListSP& prev_sp)
> {
>     Mutex::Locker curr_locker (curr_ap.get() ? &curr_ap->m_mutex : NULL);
>     Mutex::Locker prev_locker (prev_sp.get() ? &prev_sp->m_mutex : NULL);
>
>Modified: lldb/trunk/source/Target/Target.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?re
>v=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Target/Target.cpp (original)
>+++ lldb/trunk/source/Target/Target.cpp Thu Apr 18 13:10:51 2013
>@@ -76,9 +76,9 @@ Target::Target(Debugger &debugger, const
>     m_valid (true),
>     m_search_filter_sp (),
>     m_image_search_paths (ImageSearchPathsChanged, this),
>-    m_scratch_ast_context_ap (NULL),
>-    m_scratch_ast_source_ap (NULL),
>-    m_ast_importer_ap (NULL),
>+    m_scratch_ast_context_ap (),
>+    m_scratch_ast_source_ap (),
>+    m_ast_importer_ap (),
>     m_persistent_variables (),
>     m_source_manager_ap(),
>     m_stop_hooks (),
>@@ -2143,7 +2143,7 @@ Target::StopHook::StopHook (lldb::Target
>         m_target_sp (target_sp),
>         m_commands (),
>         m_specifier_sp (),
>-        m_thread_spec_ap(NULL),
>+        m_thread_spec_ap(),
>         m_active (true)
> {
> }
>@@ -2153,7 +2153,7 @@ Target::StopHook::StopHook (const StopHo
>         m_target_sp (rhs.m_target_sp),
>         m_commands (rhs.m_commands),
>         m_specifier_sp (rhs.m_specifier_sp),
>-        m_thread_spec_ap (NULL),
>+        m_thread_spec_ap (),
>         m_active (rhs.m_active)
> {
>     if (rhs.m_thread_spec_ap.get() != NULL)
>
>Modified: lldb/trunk/source/Target/UnwindAssembly.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/UnwindAssembl
>y.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/source/Target/UnwindAssembly.cpp (original)
>+++ lldb/trunk/source/Target/UnwindAssembly.cpp Thu Apr 18 13:10:51 2013
>@@ -24,7 +24,7 @@ UnwindAssembly::FindPlugin (const ArchSp
>          (create_callback = 
>PluginManager::GetUnwindAssemblyCreateCallbackAtIndex(idx)) != NULL;
>          ++idx)
>     {
>-        std::auto_ptr<UnwindAssembly> assembly_profiler_ap 
>(create_callback (arch));
>+        STD_UNIQUE_PTR(UnwindAssembly) assembly_profiler_ap 
>(create_callback (arch));
>         if (assembly_profiler_ap.get ())
>             return assembly_profiler_ap.release ();
>     }
>
>Modified: lldb/trunk/tools/debugserver/source/DNBDefs.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DN
>BDefs.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/tools/debugserver/source/DNBDefs.h (original)
>+++ lldb/trunk/tools/debugserver/source/DNBDefs.h Thu Apr 18 13:10:51 2013
>@@ -26,11 +26,13 @@
> #include <memory>
> #define STD_SHARED_PTR(T) std::shared_ptr<T>
> #define STD_WEAK_PTR(T) std::weak_ptr<T>
>+#define STD_UNIQUE_PTR(T) std::unique_ptr<T>
> #define STD_ENABLE_SHARED_FROM_THIS(T) std::enable_shared_from_this<T>
> #else
> #include <tr1/memory>
> #define STD_SHARED_PTR(T) std::tr1::shared_ptr<T>
> #define STD_WEAK_PTR(T) std::tr1::weak_ptr<T>
>+#define STD_UNIQUE_PTR(T) std::auto_ptr<T>
> #define STD_ENABLE_SHARED_FROM_THIS(T) 
>std::tr1::enable_shared_from_this<T>
> #endif
> 
>
>Modified: lldb/trunk/tools/debugserver/source/DNBTimer.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DN
>BTimer.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/tools/debugserver/source/DNBTimer.h (original)
>+++ lldb/trunk/tools/debugserver/source/DNBTimer.h Thu Apr 18 13:10:51 
>2013
>@@ -16,7 +16,7 @@
> 
> #include <sys/time.h>
> #include <stdint.h>
>-#include <memory>
>+#include "DNBDefs.h"
> #include "PThreadMutex.h"
> 
> class DNBTimer
>@@ -155,7 +155,7 @@ protected:
>     //------------------------------------------------------------------
>     // Classes that inherit from DNBTimer can see and modify these
>     //------------------------------------------------------------------
>-        std::auto_ptr<PThreadMutex> m_mutexAP;
>+        STD_UNIQUE_PTR(PThreadMutex) m_mutexAP;
>         struct timeval  m_timeval;
> };
> 
>
>Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/Ma
>cOSX/MachThread.h?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h (original)
>+++ lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h Thu Apr 18 
>13:10:51 2013
>@@ -130,7 +130,7 @@ protected:
>     int32_t                         m_suspend_count; // The current 
>suspend count > 0 means we have suspended m_suspendCount times,
>                                                     //                   
>        < 0 means we have resumed it m_suspendCount times.
>     MachException::Data             m_stop_exception; // The best 
>exception that describes why this thread is stopped
>-    std::auto_ptr<DNBArchProtocol>  m_arch_ap;      // Arch specific 
>information for register state and more
>+    STD_UNIQUE_PTR(DNBArchProtocol) m_arch_ap;      // Arch specific 
>information for register state and more
>     const DNBRegisterSetInfo *      m_reg_sets;      // Register set 
>information for this thread
>     nub_size_t                      m_num_reg_sets;
>     thread_identifier_info_data_t   m_ident_info;
>
>Modified: lldb/trunk/tools/driver/Driver.h
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Driver.h?rev=1
>79779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/tools/driver/Driver.h (original)
>+++ lldb/trunk/tools/driver/Driver.h Thu Apr 18 13:10:51 2013
>@@ -160,7 +160,7 @@ private:
>     lldb_utility::PseudoTerminal m_editline_pty;
>     FILE *m_editline_slave_fh;
>     lldb::SBInputReader m_editline_reader;
>-    std::auto_ptr<IOChannel> m_io_channel_ap;
>+    STD_UNIQUE_PTR(IOChannel) m_io_channel_ap;
>     OptionData m_option_data;
>     bool m_waiting_for_command;
>     bool m_done;
>
>Modified: lldb/trunk/tools/lldb-platform/lldb-platform.cpp
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-platform/lldb-pl
>atform.cpp?rev=179779&r1=179778&r2=179779&view=diff
>==========================================================================
>====
>--- lldb/trunk/tools/lldb-platform/lldb-platform.cpp (original)
>+++ lldb/trunk/tools/lldb-platform/lldb-platform.cpp Thu Apr 18 13:10:51 
>2013
>@@ -185,7 +185,7 @@ main (int argc, char *argv[])
>     GDBRemoteCommunicationServer gdb_server (true);
>     if (!listen_host_port.empty())
>     {
>-        std::auto_ptr<ConnectionFileDescriptor> conn_ap(new 
>ConnectionFileDescriptor());
>+        STD_UNIQUE_PTR(ConnectionFileDescriptor) conn_ap(new 
>ConnectionFileDescriptor());
>         if (conn_ap.get())
>         {
>             std::string connect_url ("listen://");
>
>
>_______________________________________________
>lldb-commits mailing list
>lldb-commits at cs.uiuc.edu
>http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits





More information about the lldb-commits mailing list