Since we use C++11, we should switch over to using std::unique_ptr when C++11 is being used. To do this, we follow what we have done for shared pointers and we define a STD_UNIQUE_PTR macro that can be used and it will "do the right thing". Due to some API differences in std::unique_ptr and due to the fact that we need to be able to compile without C++11, we can't use move semantics so some code needed to change so that it can compile with either C++.

Anyone wanting to use a unique_ptr or auto_ptr should now use the "STD_UNIQUE_PTR(TYPE)" macro.

llvm-svn: 179779

1 files changed, 2 insertions, 2 deletions

diff --git a/lldb/tools/debugserver/source/DNBTimer.h b/lldb/tools/debugserver/source/DNBTimer.h
index a78b80f606d..ac69d9a36a1 100644
--- a/lldb/tools/debugserver/source/DNBTimer.h
+++ b/lldb/tools/debugserver/source/DNBTimer.h
@@ -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;
 };