diff options
Diffstat (limited to 'lldb/tools/debugserver/source')
| -rw-r--r-- | lldb/tools/debugserver/source/DNBDefs.h | 2 | ||||
| -rw-r--r-- | lldb/tools/debugserver/source/DNBTimer.h | 4 | ||||
| -rw-r--r-- | lldb/tools/debugserver/source/MacOSX/MachThread.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lldb/tools/debugserver/source/DNBDefs.h b/lldb/tools/debugserver/source/DNBDefs.h index de8b99a2f04..98b7310ca5a 100644 --- a/lldb/tools/debugserver/source/DNBDefs.h +++ b/lldb/tools/debugserver/source/DNBDefs.h @@ -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 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; }; diff --git a/lldb/tools/debugserver/source/MacOSX/MachThread.h b/lldb/tools/debugserver/source/MacOSX/MachThread.h index 87643d9cc53..27573c5c8ec 100644 --- a/lldb/tools/debugserver/source/MacOSX/MachThread.h +++ b/lldb/tools/debugserver/source/MacOSX/MachThread.h @@ -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; |
