[Lldb-commits] [lldb] r152698 - in /lldb/trunk: include/lldb/ include/lldb/API/ include/lldb/Breakpoint/ include/lldb/Core/ include/lldb/Expression/ include/lldb/Interpreter/ include/lldb/Symbol/ include/lldb/Target/ include/lldb/Utility/ source/API/ source/Commands/ source/Expression/ source/Plugins/ObjectContainer/BSD-Archive/ source/Plugins/Process/Utility/ source/Plugins/SymbolFile/DWARF/ tools/debugserver/debugserver.xcodeproj/ tools/debugserver/source/ tools/debugserver/source/MacOSX/
Greg Clayton
gclayton at apple.com
Tue Mar 13 20:07:06 PDT 2012
Author: gclayton
Date: Tue Mar 13 22:07:05 2012
New Revision: 152698
URL: http://llvm.org/viewvc/llvm-project?rev=152698&view=rev
Log:
<rdar://problem/10434005>
Prepare LLDB to be built with C++11 by hiding all accesses to std::tr1 behind
macros that allows us to easily compile for either C++.
Modified:
lldb/trunk/include/lldb/API/SBFrame.h
lldb/trunk/include/lldb/Breakpoint/Breakpoint.h
lldb/trunk/include/lldb/Breakpoint/BreakpointLocation.h
lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h
lldb/trunk/include/lldb/Core/Debugger.h
lldb/trunk/include/lldb/Core/FormatClasses.h
lldb/trunk/include/lldb/Core/FormatManager.h
lldb/trunk/include/lldb/Core/FormatNavigator.h
lldb/trunk/include/lldb/Core/Module.h
lldb/trunk/include/lldb/Core/Section.h
lldb/trunk/include/lldb/Core/SourceManager.h
lldb/trunk/include/lldb/Core/UserSettingsController.h
lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h
lldb/trunk/include/lldb/Expression/ClangUserExpression.h
lldb/trunk/include/lldb/Interpreter/Args.h
lldb/trunk/include/lldb/Symbol/ClangASTImporter.h
lldb/trunk/include/lldb/Symbol/DWARFCallFrameInfo.h
lldb/trunk/include/lldb/Symbol/ObjectFile.h
lldb/trunk/include/lldb/Symbol/Type.h
lldb/trunk/include/lldb/Target/Memory.h
lldb/trunk/include/lldb/Target/Process.h
lldb/trunk/include/lldb/Target/RegisterContext.h
lldb/trunk/include/lldb/Target/StackFrame.h
lldb/trunk/include/lldb/Target/Target.h
lldb/trunk/include/lldb/Target/Thread.h
lldb/trunk/include/lldb/Utility/PriorityPointerPair.h
lldb/trunk/include/lldb/lldb-forward.h
lldb/trunk/include/lldb/lldb-types.h
lldb/trunk/source/API/SBTypeCategory.cpp
lldb/trunk/source/API/SBValue.cpp
lldb/trunk/source/Commands/CommandObjectType.cpp
lldb/trunk/source/Expression/IRInterpreter.cpp
lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.h
lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.h
lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h
lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj
lldb/trunk/tools/debugserver/source/DNB.cpp
lldb/trunk/tools/debugserver/source/DNBDefs.h
lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h
lldb/trunk/tools/debugserver/source/RNBDefs.h
Modified: lldb/trunk/include/lldb/API/SBFrame.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBFrame.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/API/SBFrame.h (original)
+++ lldb/trunk/include/lldb/API/SBFrame.h Tue Mar 13 22:07:05 2012
@@ -19,7 +19,7 @@
class SBFrame
{
public:
- typedef SHARED_PTR(lldb_private::StackFrameImpl) StackFrameImplSP;
+ typedef STD_SHARED_PTR(lldb_private::StackFrameImpl) StackFrameImplSP;
SBFrame ();
SBFrame (const lldb::SBFrame &rhs);
Modified: lldb/trunk/include/lldb/Breakpoint/Breakpoint.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Breakpoint.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Breakpoint/Breakpoint.h (original)
+++ lldb/trunk/include/lldb/Breakpoint/Breakpoint.h Tue Mar 13 22:07:05 2012
@@ -74,7 +74,7 @@
/// not by the breakpoint.
//----------------------------------------------------------------------
class Breakpoint:
- public std::tr1::enable_shared_from_this<Breakpoint>,
+ public STD_ENABLE_SHARED_FROM_THIS(Breakpoint),
public Stoppoint
{
public:
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointLocation.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointLocation.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Breakpoint/BreakpointLocation.h (original)
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointLocation.h Tue Mar 13 22:07:05 2012
@@ -47,7 +47,7 @@
//----------------------------------------------------------------------
class BreakpointLocation :
- public std::tr1::enable_shared_from_this<BreakpointLocation>,
+ public STD_ENABLE_SHARED_FROM_THIS(BreakpointLocation),
public StoppointLocation
{
public:
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h (original)
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h Tue Mar 13 22:07:05 2012
@@ -39,7 +39,7 @@
//----------------------------------------------------------------------
class BreakpointSite :
- public std::tr1::enable_shared_from_this<BreakpointSite>,
+ public STD_ENABLE_SHARED_FROM_THIS(BreakpointSite),
public StoppointLocation
{
public:
Modified: lldb/trunk/include/lldb/Core/Debugger.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Debugger.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Debugger.h (original)
+++ lldb/trunk/include/lldb/Core/Debugger.h Tue Mar 13 22:07:05 2012
@@ -252,7 +252,7 @@
class Debugger :
- public std::tr1::enable_shared_from_this<Debugger>,
+ public STD_ENABLE_SHARED_FROM_THIS(Debugger),
public UserID,
public DebuggerInstanceSettings,
public BroadcasterManager
Modified: lldb/trunk/include/lldb/Core/FormatClasses.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatClasses.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FormatClasses.h (original)
+++ lldb/trunk/include/lldb/Core/FormatClasses.h Tue Mar 13 22:07:05 2012
@@ -139,7 +139,7 @@
TypeFormatImpl (lldb::Format f = lldb::eFormatInvalid,
const Flags& flags = Flags());
- typedef SHARED_PTR(TypeFormatImpl) SharedPointer;
+ typedef STD_SHARED_PTR(TypeFormatImpl) SharedPointer;
typedef bool(*ValueCallback)(void*, ConstString, const lldb::TypeFormatImplSP&);
~TypeFormatImpl ()
@@ -246,7 +246,7 @@
virtual void
Update() = 0;
- typedef SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
+ typedef STD_SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
};
@@ -422,7 +422,7 @@
virtual SyntheticChildrenFrontEnd::SharedPointer
GetFrontEnd (lldb::ValueObjectSP backend) = 0;
- typedef SHARED_PTR(SyntheticChildren) SharedPointer;
+ typedef STD_SHARED_PTR(SyntheticChildren) SharedPointer;
typedef bool(*SyntheticChildrenCallback)(void*, ConstString, const SyntheticChildren::SharedPointer&);
uint32_t&
@@ -565,7 +565,7 @@
return UINT32_MAX;
}
- typedef SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
+ typedef STD_SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
};
@@ -674,7 +674,7 @@
return m_interpreter->GetIndexOfChildWithName(m_wrapper_sp, name.GetCString());
}
- typedef SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
+ typedef STD_SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
};
@@ -871,7 +871,7 @@
virtual uint32_t
GetIndexOfChildWithName (const ConstString &name_cs);
- typedef SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
+ typedef STD_SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
};
@@ -1174,7 +1174,7 @@
return m_my_revision;
}
- typedef SHARED_PTR(TypeSummaryImpl) SharedPointer;
+ typedef STD_SHARED_PTR(TypeSummaryImpl) SharedPointer;
typedef bool(*SummaryCallback)(void*, ConstString, const lldb::TypeSummaryImplSP&);
typedef bool(*RegexSummaryCallback)(void*, lldb::RegularExpressionSP, const lldb::TypeSummaryImplSP&);
@@ -1289,7 +1289,7 @@
return true;
}
- typedef SHARED_PTR(ScriptSummaryFormat) SharedPointer;
+ typedef STD_SHARED_PTR(ScriptSummaryFormat) SharedPointer;
};
Modified: lldb/trunk/include/lldb/Core/FormatManager.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatManager.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FormatManager.h (original)
+++ lldb/trunk/include/lldb/Core/FormatManager.h Tue Mar 13 22:07:05 2012
@@ -218,7 +218,7 @@
const char** matching_category = NULL,
FormatCategoryItems* matching_type = NULL);
- typedef SHARED_PTR(TypeCategoryImpl) SharedPointer;
+ typedef STD_SHARED_PTR(TypeCategoryImpl) SharedPointer;
private:
SummaryNavigator::SharedPointer m_summary_nav;
Modified: lldb/trunk/include/lldb/Core/FormatNavigator.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatNavigator.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FormatNavigator.h (original)
+++ lldb/trunk/include/lldb/Core/FormatNavigator.h Tue Mar 13 22:07:05 2012
@@ -260,8 +260,11 @@
typedef typename MapType::key_type MapKeyType;
typedef typename MapType::mapped_type MapValueType;
typedef typename BackEndType::CallbackType CallbackType;
-
+#ifdef _LIBCPP_VERSION
+ typedef typename std::shared_ptr<FormatNavigator<KeyType, ValueType> > SharedPointer;
+#else
typedef typename std::tr1::shared_ptr<FormatNavigator<KeyType, ValueType> > SharedPointer;
+#endif
friend class TypeCategoryImpl;
Modified: lldb/trunk/include/lldb/Core/Module.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Module.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Module.h (original)
+++ lldb/trunk/include/lldb/Core/Module.h Tue Mar 13 22:07:05 2012
@@ -281,7 +281,7 @@
};
class Module :
- public std::tr1::enable_shared_from_this<Module>,
+ public STD_ENABLE_SHARED_FROM_THIS(Module),
public SymbolContextScope
{
public:
Modified: lldb/trunk/include/lldb/Core/Section.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Section.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Section.h (original)
+++ lldb/trunk/include/lldb/Core/Section.h Tue Mar 13 22:07:05 2012
@@ -92,7 +92,7 @@
class Section :
- public std::tr1::enable_shared_from_this<Section>,
+ public STD_ENABLE_SHARED_FROM_THIS(Section),
public ModuleChild,
public UserID,
public Flags
Modified: lldb/trunk/include/lldb/Core/SourceManager.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/SourceManager.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/SourceManager.h (original)
+++ lldb/trunk/include/lldb/Core/SourceManager.h Tue Mar 13 22:07:05 2012
@@ -79,7 +79,7 @@
#endif // SWIG
- typedef std::tr1::shared_ptr<File> FileSP;
+ typedef STD_SHARED_PTR(File) FileSP;
#ifndef SWIG
Modified: lldb/trunk/include/lldb/Core/UserSettingsController.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/UserSettingsController.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/UserSettingsController.h (original)
+++ lldb/trunk/include/lldb/Core/UserSettingsController.h Tue Mar 13 22:07:05 2012
@@ -50,7 +50,7 @@
} UserSettingDefinition;
class UserSettingsController :
- public std::tr1::enable_shared_from_this<UserSettingsController>
+ public STD_ENABLE_SHARED_FROM_THIS(UserSettingsController)
{
public:
Modified: lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionVariable.h Tue Mar 13 22:07:05 2012
@@ -217,7 +217,7 @@
void
TransferAddress (bool force = false);
- typedef SHARED_PTR(ValueObjectConstResult) ValueObjectConstResultSP;
+ typedef STD_SHARED_PTR(ValueObjectConstResult) ValueObjectConstResultSP;
//----------------------------------------------------------------------
/// Members
Modified: lldb/trunk/include/lldb/Expression/ClangUserExpression.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangUserExpression.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangUserExpression.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangUserExpression.h Tue Mar 13 22:07:05 2012
@@ -47,7 +47,7 @@
class ClangUserExpression : public ClangExpression
{
public:
- typedef SHARED_PTR(ClangUserExpression) ClangUserExpressionSP;
+ typedef STD_SHARED_PTR(ClangUserExpression) ClangUserExpressionSP;
//------------------------------------------------------------------
/// Constructor
Modified: lldb/trunk/include/lldb/Interpreter/Args.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/Args.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/Args.h (original)
+++ lldb/trunk/include/lldb/Interpreter/Args.h Tue Mar 13 22:07:05 2012
@@ -30,7 +30,7 @@
typedef std::pair<int, std::string> OptionArgValue;
typedef std::pair<std::string, OptionArgValue> OptionArgPair;
typedef std::vector<OptionArgPair> OptionArgVector;
-typedef SHARED_PTR(OptionArgVector) OptionArgVectorSP;
+typedef STD_SHARED_PTR(OptionArgVector) OptionArgVectorSP;
struct OptionArgElement
{
Modified: lldb/trunk/include/lldb/Symbol/ClangASTImporter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTImporter.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTImporter.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTImporter.h Tue Mar 13 22:07:05 2012
@@ -89,7 +89,7 @@
//
typedef std::vector < std::pair<lldb::ModuleSP, ClangNamespaceDecl> > NamespaceMap;
- typedef SHARED_PTR(NamespaceMap) NamespaceMapSP;
+ typedef STD_SHARED_PTR(NamespaceMap) NamespaceMapSP;
void RegisterNamespaceMap (const clang::NamespaceDecl *decl,
NamespaceMapSP &namespace_map);
@@ -196,7 +196,7 @@
clang::ASTContext *m_source_ctx;
};
- typedef SHARED_PTR(Minion) MinionSP;
+ typedef STD_SHARED_PTR(Minion) MinionSP;
typedef std::map<clang::ASTContext *, MinionSP> MinionMap;
typedef std::map<const clang::NamespaceDecl *, NamespaceMapSP> NamespaceMetaMap;
@@ -219,7 +219,7 @@
MapCompleter *m_map_completer;
};
- typedef SHARED_PTR(ASTContextMetadata) ASTContextMetadataSP;
+ typedef STD_SHARED_PTR(ASTContextMetadata) ASTContextMetadataSP;
typedef std::map<const clang::ASTContext *, ASTContextMetadataSP> ContextMetadataMap;
ContextMetadataMap m_metadata_map;
Modified: lldb/trunk/include/lldb/Symbol/DWARFCallFrameInfo.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/DWARFCallFrameInfo.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/DWARFCallFrameInfo.h (original)
+++ lldb/trunk/include/lldb/Symbol/DWARFCallFrameInfo.h Tue Mar 13 22:07:05 2012
@@ -78,7 +78,7 @@
inst_length (0), ptr_encoding (0), initial_row() {}
};
- typedef SHARED_PTR(CIE) CIESP;
+ typedef STD_SHARED_PTR(CIE) CIESP;
struct FDEEntry
{
Modified: lldb/trunk/include/lldb/Symbol/ObjectFile.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ObjectFile.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ObjectFile.h (original)
+++ lldb/trunk/include/lldb/Symbol/ObjectFile.h Tue Mar 13 22:07:05 2012
@@ -50,7 +50,7 @@
/// this abstract class.
//----------------------------------------------------------------------
class ObjectFile:
- public std::tr1::enable_shared_from_this<ObjectFile>,
+ public STD_ENABLE_SHARED_FROM_THIS(ObjectFile),
public PluginInterface,
public ModuleChild
{
Modified: lldb/trunk/include/lldb/Symbol/Type.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Type.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/Type.h (original)
+++ lldb/trunk/include/lldb/Symbol/Type.h Tue Mar 13 22:07:05 2012
@@ -21,7 +21,7 @@
namespace lldb_private {
class SymbolFileType :
- public std::tr1::enable_shared_from_this<SymbolFileType>,
+ public STD_ENABLE_SHARED_FROM_THIS(SymbolFileType),
public UserID
{
public:
@@ -50,7 +50,7 @@
};
class Type :
- public std::tr1::enable_shared_from_this<Type>,
+ public STD_ENABLE_SHARED_FROM_THIS(Type),
public UserID
{
public:
Modified: lldb/trunk/include/lldb/Target/Memory.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Memory.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Memory.h (original)
+++ lldb/trunk/include/lldb/Target/Memory.h Tue Mar 13 22:07:05 2012
@@ -170,7 +170,7 @@
DeallocateMemory (lldb::addr_t ptr);
protected:
- typedef std::tr1::shared_ptr<AllocatedBlock> AllocatedBlockSP;
+ typedef STD_SHARED_PTR(AllocatedBlock) AllocatedBlockSP;
AllocatedBlockSP
AllocatePage (uint32_t byte_size,
Modified: lldb/trunk/include/lldb/Target/Process.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Process.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Process.h (original)
+++ lldb/trunk/include/lldb/Target/Process.h Tue Mar 13 22:07:05 2012
@@ -1260,7 +1260,7 @@
/// @brief A plug-in interface definition class for debugging a process.
//----------------------------------------------------------------------
class Process :
- public std::tr1::enable_shared_from_this<Process>,
+ public STD_ENABLE_SHARED_FROM_THIS(Process),
public UserID,
public Broadcaster,
public ExecutionContextScope,
Modified: lldb/trunk/include/lldb/Target/RegisterContext.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/RegisterContext.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/RegisterContext.h (original)
+++ lldb/trunk/include/lldb/Target/RegisterContext.h Tue Mar 13 22:07:05 2012
@@ -20,7 +20,7 @@
namespace lldb_private {
class RegisterContext :
- public std::tr1::enable_shared_from_this<RegisterContext>,
+ public STD_ENABLE_SHARED_FROM_THIS(RegisterContext),
public ExecutionContextScope
{
public:
Modified: lldb/trunk/include/lldb/Target/StackFrame.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/StackFrame.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/StackFrame.h (original)
+++ lldb/trunk/include/lldb/Target/StackFrame.h Tue Mar 13 22:07:05 2012
@@ -27,7 +27,7 @@
namespace lldb_private {
class StackFrame :
- public std::tr1::enable_shared_from_this<StackFrame>,
+ public STD_ENABLE_SHARED_FROM_THIS(StackFrame),
public ExecutionContextScope
{
public:
Modified: lldb/trunk/include/lldb/Target/Target.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Target.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Target.h (original)
+++ lldb/trunk/include/lldb/Target/Target.h Tue Mar 13 22:07:05 2012
@@ -260,7 +260,7 @@
// Target
//----------------------------------------------------------------------
class Target :
- public std::tr1::enable_shared_from_this<Target>,
+ public STD_ENABLE_SHARED_FROM_THIS(Target),
public Broadcaster,
public ExecutionContextScope,
public TargetInstanceSettings
@@ -997,7 +997,7 @@
StopHook (lldb::TargetSP target_sp, lldb::user_id_t uid);
friend class Target;
};
- typedef SHARED_PTR(StopHook) StopHookSP;
+ typedef STD_SHARED_PTR(StopHook) StopHookSP;
// Add an empty stop hook to the Target's stop hook list, and returns a shared pointer to it in new_hook.
// Returns the id of the new hook.
Modified: lldb/trunk/include/lldb/Target/Thread.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Thread.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Thread.h (original)
+++ lldb/trunk/include/lldb/Target/Thread.h Tue Mar 13 22:07:05 2012
@@ -85,7 +85,7 @@
};
class Thread :
- public std::tr1::enable_shared_from_this<Thread>,
+ public STD_ENABLE_SHARED_FROM_THIS(Thread),
public UserID,
public ExecutionContextScope,
public ThreadInstanceSettings
Modified: lldb/trunk/include/lldb/Utility/PriorityPointerPair.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/PriorityPointerPair.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/PriorityPointerPair.h (original)
+++ lldb/trunk/include/lldb/Utility/PriorityPointerPair.h Tue Mar 13 22:07:05 2012
@@ -30,7 +30,7 @@
typedef T& reference_type;
typedef T* pointer_type;
- typedef typename SHARED_PTR(T) T_SP;
+ typedef typename STD_SHARED_PTR(T) T_SP;
PriorityPointerPair() :
m_high(),
Modified: lldb/trunk/include/lldb/lldb-forward.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-forward.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-forward.h (original)
+++ lldb/trunk/include/lldb/lldb-forward.h Tue Mar 13 22:07:05 2012
@@ -12,7 +12,22 @@
#if defined(__cplusplus)
-#include <tr1/memory> // for std::tr1::shared_ptr, std::tr1::weak_ptr
+#include <ciso646> // detect C++ lib
+
+#ifdef _LIBCPP_VERSION
+#include <memory>
+#define STD_SHARED_PTR(T) std::shared_ptr<T>
+#define STD_WEAK_PTR(T) std::shared_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_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
+
#include "lldb/Utility/SharingPtr.h"
//----------------------------------------------------------------------
@@ -229,99 +244,99 @@
//----------------------------------------------------------------------
namespace lldb {
- typedef std::tr1::shared_ptr<lldb_private::ABI> ABISP;
- typedef std::tr1::shared_ptr<lldb_private::Baton> BatonSP;
- typedef std::tr1::shared_ptr<lldb_private::Block> BlockSP;
- typedef std::tr1::shared_ptr<lldb_private::Breakpoint> BreakpointSP;
- typedef std::tr1::weak_ptr<lldb_private::Breakpoint> BreakpointWP;
- typedef std::tr1::shared_ptr<lldb_private::BreakpointSite> BreakpointSiteSP;
- typedef std::tr1::weak_ptr<lldb_private::BreakpointSite> BreakpointSiteWP;
- typedef std::tr1::shared_ptr<lldb_private::BreakpointLocation> BreakpointLocationSP;
- typedef std::tr1::weak_ptr<lldb_private::BreakpointLocation> BreakpointLocationWP;
- typedef std::tr1::shared_ptr<lldb_private::BreakpointResolver> BreakpointResolverSP;
- typedef std::tr1::shared_ptr<lldb_private::Broadcaster> BroadcasterSP;
- typedef std::tr1::shared_ptr<lldb_private::ClangExpressionVariable> ClangExpressionVariableSP;
- typedef std::tr1::shared_ptr<lldb_private::CommandObject> CommandObjectSP;
- typedef std::tr1::shared_ptr<lldb_private::Communication> CommunicationSP;
- typedef std::tr1::shared_ptr<lldb_private::Connection> ConnectionSP;
- typedef std::tr1::shared_ptr<lldb_private::CompileUnit> CompUnitSP;
- typedef std::tr1::shared_ptr<lldb_private::DataBuffer> DataBufferSP;
- typedef std::tr1::shared_ptr<lldb_private::DataExtractor> DataExtractorSP;
- typedef std::tr1::shared_ptr<lldb_private::Debugger> DebuggerSP;
- typedef std::tr1::weak_ptr<lldb_private::Debugger> DebuggerWP;
- typedef std::tr1::shared_ptr<lldb_private::Disassembler> DisassemblerSP;
- typedef std::tr1::shared_ptr<lldb_private::DynamicLoader> DynamicLoaderSP;
- typedef std::tr1::shared_ptr<lldb_private::Event> EventSP;
- typedef std::tr1::shared_ptr<lldb_private::TypeCategoryImpl> TypeCategoryImplSP;
- typedef std::tr1::shared_ptr<lldb_private::Function> FunctionSP;
- typedef std::tr1::shared_ptr<lldb_private::InlineFunctionInfo> InlineFunctionInfoSP;
- typedef std::tr1::shared_ptr<lldb_private::InputReader> InputReaderSP;
- typedef std::tr1::shared_ptr<lldb_private::InstanceSettings> InstanceSettingsSP;
- typedef std::tr1::shared_ptr<lldb_private::Instruction> InstructionSP;
- typedef std::tr1::shared_ptr<lldb_private::LanguageRuntime> LanguageRuntimeSP;
- typedef std::tr1::shared_ptr<lldb_private::LineTable> LineTableSP;
- typedef std::tr1::shared_ptr<lldb_private::Listener> ListenerSP;
- typedef std::tr1::shared_ptr<lldb_private::Log> LogSP;
- typedef std::tr1::shared_ptr<lldb_private::LogChannel> LogChannelSP;
- typedef std::tr1::shared_ptr<lldb_private::Module> ModuleSP;
- typedef std::tr1::weak_ptr<lldb_private::Module> ModuleWP;
- typedef std::tr1::shared_ptr<lldb_private::ObjectFile> ObjectFileSP;
- typedef std::tr1::weak_ptr<lldb_private::ObjectFile> ObjectFileWP;
- typedef std::tr1::shared_ptr<lldb_private::OptionValue> OptionValueSP;
- typedef std::tr1::shared_ptr<lldb_private::Platform> PlatformSP;
- typedef std::tr1::shared_ptr<lldb_private::Process> ProcessSP;
- typedef std::tr1::shared_ptr<lldb_private::ProcessAttachInfo> ProcessAttachInfoSP;
- typedef std::tr1::shared_ptr<lldb_private::ProcessLaunchInfo> ProcessLaunchInfoSP;
- typedef std::tr1::weak_ptr<lldb_private::Process> ProcessWP;
- typedef std::tr1::shared_ptr<lldb_private::RegisterContext> RegisterContextSP;
- typedef std::tr1::shared_ptr<lldb_private::RegularExpression> RegularExpressionSP;
- typedef std::tr1::shared_ptr<lldb_private::Section> SectionSP;
- typedef std::tr1::weak_ptr<lldb_private::Section> SectionWP;
- typedef std::tr1::shared_ptr<lldb_private::SearchFilter> SearchFilterSP;
- typedef std::tr1::shared_ptr<lldb_private::ScriptInterpreterObject> ScriptInterpreterObjectSP;
+ typedef STD_SHARED_PTR(lldb_private::ABI) ABISP;
+ typedef STD_SHARED_PTR(lldb_private::Baton) BatonSP;
+ typedef STD_SHARED_PTR(lldb_private::Block) BlockSP;
+ typedef STD_SHARED_PTR(lldb_private::Breakpoint) BreakpointSP;
+ typedef STD_WEAK_PTR(lldb_private::Breakpoint) BreakpointWP;
+ typedef STD_SHARED_PTR(lldb_private::BreakpointSite) BreakpointSiteSP;
+ typedef STD_WEAK_PTR(lldb_private::BreakpointSite) BreakpointSiteWP;
+ typedef STD_SHARED_PTR(lldb_private::BreakpointLocation) BreakpointLocationSP;
+ typedef STD_WEAK_PTR(lldb_private::BreakpointLocation) BreakpointLocationWP;
+ typedef STD_SHARED_PTR(lldb_private::BreakpointResolver) BreakpointResolverSP;
+ typedef STD_SHARED_PTR(lldb_private::Broadcaster) BroadcasterSP;
+ typedef STD_SHARED_PTR(lldb_private::ClangExpressionVariable) ClangExpressionVariableSP;
+ typedef STD_SHARED_PTR(lldb_private::CommandObject) CommandObjectSP;
+ typedef STD_SHARED_PTR(lldb_private::Communication) CommunicationSP;
+ typedef STD_SHARED_PTR(lldb_private::Connection) ConnectionSP;
+ typedef STD_SHARED_PTR(lldb_private::CompileUnit) CompUnitSP;
+ typedef STD_SHARED_PTR(lldb_private::DataBuffer) DataBufferSP;
+ typedef STD_SHARED_PTR(lldb_private::DataExtractor) DataExtractorSP;
+ typedef STD_SHARED_PTR(lldb_private::Debugger) DebuggerSP;
+ typedef STD_WEAK_PTR(lldb_private::Debugger) DebuggerWP;
+ typedef STD_SHARED_PTR(lldb_private::Disassembler) DisassemblerSP;
+ typedef STD_SHARED_PTR(lldb_private::DynamicLoader) DynamicLoaderSP;
+ typedef STD_SHARED_PTR(lldb_private::Event) EventSP;
+ typedef STD_SHARED_PTR(lldb_private::TypeCategoryImpl) TypeCategoryImplSP;
+ typedef STD_SHARED_PTR(lldb_private::Function) FunctionSP;
+ typedef STD_SHARED_PTR(lldb_private::InlineFunctionInfo) InlineFunctionInfoSP;
+ typedef STD_SHARED_PTR(lldb_private::InputReader) InputReaderSP;
+ typedef STD_SHARED_PTR(lldb_private::InstanceSettings) InstanceSettingsSP;
+ typedef STD_SHARED_PTR(lldb_private::Instruction) InstructionSP;
+ typedef STD_SHARED_PTR(lldb_private::LanguageRuntime) LanguageRuntimeSP;
+ typedef STD_SHARED_PTR(lldb_private::LineTable) LineTableSP;
+ typedef STD_SHARED_PTR(lldb_private::Listener) ListenerSP;
+ typedef STD_SHARED_PTR(lldb_private::Log) LogSP;
+ typedef STD_SHARED_PTR(lldb_private::LogChannel) LogChannelSP;
+ typedef STD_SHARED_PTR(lldb_private::Module) ModuleSP;
+ typedef STD_WEAK_PTR(lldb_private::Module) ModuleWP;
+ typedef STD_SHARED_PTR(lldb_private::ObjectFile) ObjectFileSP;
+ typedef STD_WEAK_PTR(lldb_private::ObjectFile) ObjectFileWP;
+ typedef STD_SHARED_PTR(lldb_private::OptionValue) OptionValueSP;
+ typedef STD_SHARED_PTR(lldb_private::Platform) PlatformSP;
+ typedef STD_SHARED_PTR(lldb_private::Process) ProcessSP;
+ typedef STD_SHARED_PTR(lldb_private::ProcessAttachInfo) ProcessAttachInfoSP;
+ typedef STD_SHARED_PTR(lldb_private::ProcessLaunchInfo) ProcessLaunchInfoSP;
+ typedef STD_WEAK_PTR(lldb_private::Process) ProcessWP;
+ typedef STD_SHARED_PTR(lldb_private::RegisterContext) RegisterContextSP;
+ typedef STD_SHARED_PTR(lldb_private::RegularExpression) RegularExpressionSP;
+ typedef STD_SHARED_PTR(lldb_private::Section) SectionSP;
+ typedef STD_WEAK_PTR(lldb_private::Section) SectionWP;
+ typedef STD_SHARED_PTR(lldb_private::SearchFilter) SearchFilterSP;
+ typedef STD_SHARED_PTR(lldb_private::ScriptInterpreterObject) ScriptInterpreterObjectSP;
#ifndef LLDB_DISABLE_PYTHON
- typedef std::tr1::shared_ptr<lldb_private::ScriptSummaryFormat> ScriptSummaryFormatSP;
+ typedef STD_SHARED_PTR(lldb_private::ScriptSummaryFormat) ScriptSummaryFormatSP;
#endif // #ifndef LLDB_DISABLE_PYTHON
- typedef std::tr1::shared_ptr<lldb_private::StackFrame> StackFrameSP;
- typedef std::tr1::weak_ptr<lldb_private::StackFrame> StackFrameWP;
- typedef std::tr1::shared_ptr<lldb_private::StackFrameList> StackFrameListSP;
- typedef std::tr1::shared_ptr<lldb_private::StopInfo> StopInfoSP;
- typedef std::tr1::shared_ptr<lldb_private::StoppointLocation> StoppointLocationSP;
- typedef std::tr1::shared_ptr<lldb_private::Stream> StreamSP;
- typedef std::tr1::shared_ptr<lldb_private::StringSummaryFormat> StringTypeSummaryImplSP;
- typedef std::tr1::shared_ptr<lldb_private::TypeSummaryImpl> TypeSummaryImplSP;
- typedef std::tr1::shared_ptr<lldb_private::TypeNameSpecifierImpl> TypeNameSpecifierImplSP;
- typedef std::tr1::shared_ptr<lldb_private::SymbolFile> SymbolFileSP;
- typedef std::tr1::shared_ptr<lldb_private::SymbolFileType> SymbolFileTypeSP;
- typedef std::tr1::weak_ptr<lldb_private::SymbolFileType> SymbolFileTypeWP;
- typedef std::tr1::shared_ptr<lldb_private::SymbolContextSpecifier> SymbolContextSpecifierSP;
- typedef std::tr1::shared_ptr<lldb_private::SyntheticChildren> SyntheticChildrenSP;
- typedef std::tr1::shared_ptr<lldb_private::SyntheticChildrenFrontEnd> SyntheticChildrenFrontEndSP;
- typedef std::tr1::shared_ptr<lldb_private::TypeFilterImpl> TypeFilterImplSP;
+ typedef STD_SHARED_PTR(lldb_private::StackFrame) StackFrameSP;
+ typedef STD_WEAK_PTR(lldb_private::StackFrame) StackFrameWP;
+ typedef STD_SHARED_PTR(lldb_private::StackFrameList) StackFrameListSP;
+ typedef STD_SHARED_PTR(lldb_private::StopInfo) StopInfoSP;
+ typedef STD_SHARED_PTR(lldb_private::StoppointLocation) StoppointLocationSP;
+ typedef STD_SHARED_PTR(lldb_private::Stream) StreamSP;
+ typedef STD_SHARED_PTR(lldb_private::StringSummaryFormat) StringTypeSummaryImplSP;
+ typedef STD_SHARED_PTR(lldb_private::TypeSummaryImpl) TypeSummaryImplSP;
+ typedef STD_SHARED_PTR(lldb_private::TypeNameSpecifierImpl) TypeNameSpecifierImplSP;
+ typedef STD_SHARED_PTR(lldb_private::SymbolFile) SymbolFileSP;
+ typedef STD_SHARED_PTR(lldb_private::SymbolFileType) SymbolFileTypeSP;
+ typedef STD_WEAK_PTR(lldb_private::SymbolFileType) SymbolFileTypeWP;
+ typedef STD_SHARED_PTR(lldb_private::SymbolContextSpecifier) SymbolContextSpecifierSP;
+ typedef STD_SHARED_PTR(lldb_private::SyntheticChildren) SyntheticChildrenSP;
+ typedef STD_SHARED_PTR(lldb_private::SyntheticChildrenFrontEnd) SyntheticChildrenFrontEndSP;
+ typedef STD_SHARED_PTR(lldb_private::TypeFilterImpl) TypeFilterImplSP;
#ifndef LLDB_DISABLE_PYTHON
- typedef std::tr1::shared_ptr<lldb_private::TypeSyntheticImpl> TypeSyntheticImplSP;
+ typedef STD_SHARED_PTR(lldb_private::TypeSyntheticImpl) TypeSyntheticImplSP;
#endif
- typedef std::tr1::shared_ptr<lldb_private::Target> TargetSP;
- typedef std::tr1::weak_ptr<lldb_private::Target> TargetWP;
- typedef std::tr1::shared_ptr<lldb_private::Thread> ThreadSP;
- typedef std::tr1::weak_ptr<lldb_private::Thread> ThreadWP;
- typedef std::tr1::shared_ptr<lldb_private::ThreadPlan> ThreadPlanSP;
- typedef std::tr1::shared_ptr<lldb_private::ThreadPlanTracer> ThreadPlanTracerSP;
- typedef std::tr1::shared_ptr<lldb_private::Type> TypeSP;
- typedef std::tr1::weak_ptr<lldb_private::Type> TypeWP;
- typedef std::tr1::shared_ptr<lldb_private::TypeImpl> TypeImplSP;
- typedef std::tr1::shared_ptr<lldb_private::FuncUnwinders> FuncUnwindersSP;
- typedef std::tr1::shared_ptr<lldb_private::UserSettingsController> UserSettingsControllerSP;
- typedef std::tr1::weak_ptr<lldb_private::UserSettingsController> UserSettingsControllerWP;
- typedef std::tr1::shared_ptr<lldb_private::UnwindPlan> UnwindPlanSP;
+ typedef STD_SHARED_PTR(lldb_private::Target) TargetSP;
+ typedef STD_WEAK_PTR(lldb_private::Target) TargetWP;
+ typedef STD_SHARED_PTR(lldb_private::Thread) ThreadSP;
+ typedef STD_WEAK_PTR(lldb_private::Thread) ThreadWP;
+ typedef STD_SHARED_PTR(lldb_private::ThreadPlan) ThreadPlanSP;
+ typedef STD_SHARED_PTR(lldb_private::ThreadPlanTracer) ThreadPlanTracerSP;
+ typedef STD_SHARED_PTR(lldb_private::Type) TypeSP;
+ typedef STD_WEAK_PTR(lldb_private::Type) TypeWP;
+ typedef STD_SHARED_PTR(lldb_private::TypeImpl) TypeImplSP;
+ typedef STD_SHARED_PTR(lldb_private::FuncUnwinders) FuncUnwindersSP;
+ typedef STD_SHARED_PTR(lldb_private::UserSettingsController) UserSettingsControllerSP;
+ typedef STD_WEAK_PTR(lldb_private::UserSettingsController) UserSettingsControllerWP;
+ typedef STD_SHARED_PTR(lldb_private::UnwindPlan) UnwindPlanSP;
typedef lldb_private::SharingPtr<lldb_private::ValueObject> ValueObjectSP;
- typedef std::tr1::shared_ptr<lldb_private::Value> ValueSP;
- typedef std::tr1::shared_ptr<lldb_private::TypeFormatImpl> TypeFormatImplSP;
- typedef std::tr1::shared_ptr<lldb_private::ValueList> ValueListSP;
- typedef std::tr1::shared_ptr<lldb_private::Variable> VariableSP;
- typedef std::tr1::shared_ptr<lldb_private::VariableList> VariableListSP;
- typedef std::tr1::shared_ptr<lldb_private::ValueObjectList> ValueObjectListSP;
- typedef std::tr1::shared_ptr<lldb_private::Watchpoint> WatchpointSP;
+ typedef STD_SHARED_PTR(lldb_private::Value) ValueSP;
+ typedef STD_SHARED_PTR(lldb_private::TypeFormatImpl) TypeFormatImplSP;
+ typedef STD_SHARED_PTR(lldb_private::ValueList) ValueListSP;
+ typedef STD_SHARED_PTR(lldb_private::Variable) VariableSP;
+ typedef STD_SHARED_PTR(lldb_private::VariableList) VariableListSP;
+ typedef STD_SHARED_PTR(lldb_private::ValueObjectList) ValueObjectListSP;
+ typedef STD_SHARED_PTR(lldb_private::Watchpoint) WatchpointSP;
} // namespace lldb
Modified: lldb/trunk/include/lldb/lldb-types.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-types.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-types.h (original)
+++ lldb/trunk/include/lldb/lldb-types.h Tue Mar 13 22:07:05 2012
@@ -66,7 +66,6 @@
#endif
-#define SHARED_PTR(T) std::tr1::shared_ptr<T>
#define LLDB_INVALID_HOST_TIME { 0, 0 }
namespace lldb
Modified: lldb/trunk/source/API/SBTypeCategory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBTypeCategory.cpp?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/API/SBTypeCategory.cpp (original)
+++ lldb/trunk/source/API/SBTypeCategory.cpp Tue Mar 13 22:07:05 2012
@@ -167,7 +167,7 @@
if (!children_sp)
return lldb::SBTypeFilter();
- TypeFilterImplSP filter_sp = std::tr1::static_pointer_cast<TypeFilterImpl>(children_sp);
+ TypeFilterImplSP filter_sp = STD_STATIC_POINTER_CAST(TypeFilterImpl,children_sp);
return lldb::SBTypeFilter(filter_sp);
@@ -231,7 +231,7 @@
if (!children_sp)
return lldb::SBTypeSynthetic();
- TypeSyntheticImplSP synth_sp = std::tr1::static_pointer_cast<TypeSyntheticImpl>(children_sp);
+ TypeSyntheticImplSP synth_sp = STD_STATIC_POINTER_CAST(TypeSyntheticImpl,children_sp);
return lldb::SBTypeSynthetic(synth_sp);
}
@@ -248,7 +248,7 @@
if (!children_sp.get())
return lldb::SBTypeFilter();
- TypeFilterImplSP filter_sp = std::tr1::static_pointer_cast<TypeFilterImpl>(children_sp);
+ TypeFilterImplSP filter_sp = STD_STATIC_POINTER_CAST(TypeFilterImpl,children_sp);
return lldb::SBTypeFilter(filter_sp);
}
@@ -283,7 +283,7 @@
if (!children_sp.get())
return lldb::SBTypeSynthetic();
- TypeSyntheticImplSP synth_sp = std::tr1::static_pointer_cast<TypeSyntheticImpl>(children_sp);
+ TypeSyntheticImplSP synth_sp = STD_STATIC_POINTER_CAST(TypeSyntheticImpl,children_sp);
return lldb::SBTypeSynthetic(synth_sp);
}
Modified: lldb/trunk/source/API/SBValue.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBValue.cpp?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/API/SBValue.cpp (original)
+++ lldb/trunk/source/API/SBValue.cpp Tue Mar 13 22:07:05 2012
@@ -442,7 +442,7 @@
if (synthetic_sp && !synthetic_sp->IsScripted())
{
- TypeFilterImplSP filter_sp = std::tr1::static_pointer_cast<TypeFilterImpl>(synthetic_sp);
+ TypeFilterImplSP filter_sp = STD_STATIC_POINTER_CAST(TypeFilterImpl,synthetic_sp);
filter.SetSP(filter_sp);
}
}
@@ -469,7 +469,7 @@
if (children_sp && children_sp->IsScripted())
{
- TypeSyntheticImplSP synth_sp = std::tr1::static_pointer_cast<TypeSyntheticImpl>(children_sp);
+ TypeSyntheticImplSP synth_sp = STD_STATIC_POINTER_CAST(TypeSyntheticImpl,children_sp);
synthetic.SetSP(synth_sp);
}
}
Modified: lldb/trunk/source/Commands/CommandObjectType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectType.cpp?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectType.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectType.cpp Tue Mar 13 22:07:05 2012
@@ -59,7 +59,7 @@
{
}
- typedef SHARED_PTR(ScriptAddOptions) SharedPointer;
+ typedef STD_SHARED_PTR(ScriptAddOptions) SharedPointer;
};
@@ -92,7 +92,7 @@
{
}
- typedef SHARED_PTR(SynthAddOptions) SharedPointer;
+ typedef STD_SHARED_PTR(SynthAddOptions) SharedPointer;
};
Modified: lldb/trunk/source/Expression/IRInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRInterpreter.cpp?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRInterpreter.cpp (original)
+++ lldb/trunk/source/Expression/IRInterpreter.cpp Tue Mar 13 22:07:05 2012
@@ -70,8 +70,8 @@
return s;
}
-typedef SHARED_PTR(lldb_private::DataEncoder) DataEncoderSP;
-typedef SHARED_PTR(lldb_private::DataExtractor) DataExtractorSP;
+typedef STD_SHARED_PTR(lldb_private::DataEncoder) DataEncoderSP;
+typedef STD_SHARED_PTR(lldb_private::DataExtractor) DataExtractorSP;
class Memory
{
@@ -128,7 +128,7 @@
}
};
- typedef SHARED_PTR(Allocation) AllocationSP;
+ typedef STD_SHARED_PTR(Allocation) AllocationSP;
struct Region
{
Modified: lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h (original)
+++ lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h Tue Mar 13 22:07:05 2012
@@ -118,7 +118,7 @@
class Archive
{
public:
- typedef SHARED_PTR(Archive) shared_ptr;
+ typedef STD_SHARED_PTR(Archive) shared_ptr;
typedef std::multimap<lldb_private::FileSpec, shared_ptr> Map;
static Map &
Modified: lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.h (original)
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.h Tue Mar 13 22:07:05 2012
@@ -25,7 +25,7 @@
class RegisterContextLLDB : public lldb_private::RegisterContext
{
public:
- typedef SHARED_PTR(RegisterContextLLDB) SharedPtr;
+ typedef STD_SHARED_PTR(RegisterContextLLDB) SharedPtr;
RegisterContextLLDB (lldb_private::Thread &thread,
const SharedPtr& next_frame,
Modified: lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.h (original)
+++ lldb/trunk/source/Plugins/Process/Utility/UnwindLLDB.h Tue Mar 13 22:07:05 2012
@@ -70,7 +70,7 @@
lldb::RegisterContextSP
DoCreateRegisterContextForFrame (lldb_private::StackFrame *frame);
- typedef SHARED_PTR(RegisterContextLLDB) RegisterContextLLDBSP;
+ typedef STD_SHARED_PTR(RegisterContextLLDB) RegisterContextLLDBSP;
// Needed to retrieve the "next" frame (e.g. frame 2 needs to retrieve frame 1's RegisterContextLLDB)
// The RegisterContext for frame_num must already exist or this returns an empty shared pointer.
@@ -97,7 +97,7 @@
DISALLOW_COPY_AND_ASSIGN (Cursor);
};
- typedef SHARED_PTR(Cursor) CursorSP;
+ typedef STD_SHARED_PTR(Cursor) CursorSP;
std::vector<CursorSP> m_frames;
bool m_unwind_complete; // If this is true, we've enumerated all the frames in the stack, and m_frames.size() is the
// number of frames, etc. Otherwise we've only gone as far as directly asked, and m_frames.size()
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h Tue Mar 13 22:07:05 2012
@@ -21,7 +21,7 @@
typedef CStringToDIEMap::iterator CStringToDIEMapIter;
typedef CStringToDIEMap::const_iterator CStringToDIEMapConstIter;
-typedef SHARED_PTR(DWARFCompileUnit) DWARFCompileUnitSP;
+typedef STD_SHARED_PTR(DWARFCompileUnit) DWARFCompileUnitSP;
class DWARFDebugInfo
{
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h Tue Mar 13 22:07:05 2012
@@ -68,7 +68,7 @@
{
}
- typedef SHARED_PTR(Prologue) shared_ptr;
+ typedef STD_SHARED_PTR(Prologue) shared_ptr;
uint32_t total_length; // The size in bytes of the statement information for this compilation unit (not including the total_length field itself).
uint16_t version; // Version identifier for the statement information format.
@@ -135,7 +135,7 @@
//------------------------------------------------------------------
struct LineTable
{
- typedef SHARED_PTR(LineTable) shared_ptr;
+ typedef STD_SHARED_PTR(LineTable) shared_ptr;
LineTable() :
prologue(),
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h Tue Mar 13 22:07:05 2012
@@ -141,7 +141,7 @@
lldb_private::SymbolVendor *oso_symbol_vendor;
std::vector<uint32_t> function_indexes;
std::vector<uint32_t> static_indexes;
- SHARED_PTR(lldb_private::SectionList) debug_map_sections_sp;
+ STD_SHARED_PTR(lldb_private::SectionList) debug_map_sections_sp;
CompileUnitInfo() :
so_file (),
Modified: lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/tools/debugserver/debugserver.xcodeproj/project.pbxproj Tue Mar 13 22:07:05 2012
@@ -87,7 +87,7 @@
26C637DA0C71334A0024798E /* DNBBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DNBBreakpoint.h; sourceTree = "<group>"; };
26C637DB0C71334A0024798E /* DNBDataRef.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DNBDataRef.cpp; sourceTree = "<group>"; };
26C637DC0C71334A0024798E /* DNBDataRef.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DNBDataRef.h; sourceTree = "<group>"; };
- 26C637DD0C71334A0024798E /* DNBDefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DNBDefs.h; sourceTree = "<group>"; };
+ 26C637DD0C71334A0024798E /* DNBDefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = DNBDefs.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
26C637DE0C71334A0024798E /* DNBError.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DNBError.cpp; sourceTree = "<group>"; };
26C637DF0C71334A0024798E /* DNBError.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DNBError.h; sourceTree = "<group>"; };
26C637E00C71334A0024798E /* DNBLog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DNBLog.cpp; sourceTree = "<group>"; };
Modified: lldb/trunk/tools/debugserver/source/DNB.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DNB.cpp?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/DNB.cpp (original)
+++ lldb/trunk/tools/debugserver/source/DNB.cpp Tue Mar 13 22:07:05 2012
@@ -32,7 +32,7 @@
#include "DNBThreadResumeActions.h"
#include "DNBTimer.h"
-typedef std::tr1::shared_ptr<MachProcess> MachProcessSP;
+typedef STD_SHARED_PTR(MachProcess) MachProcessSP;
typedef std::map<nub_process_t, MachProcessSP> ProcessMap;
typedef ProcessMap::iterator ProcessMapIter;
typedef ProcessMap::const_iterator ProcessMapConstIter;
Modified: lldb/trunk/tools/debugserver/source/DNBDefs.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DNBDefs.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/DNBDefs.h (original)
+++ lldb/trunk/tools/debugserver/source/DNBDefs.h Tue Mar 13 22:07:05 2012
@@ -20,6 +20,20 @@
#include <sys/syslimits.h>
#include <unistd.h>
+#include <ciso646> // detect C++ lib
+
+#ifdef _LIBCPP_VERSION
+#include <memory>
+#define STD_SHARED_PTR(T) std::shared_ptr<T>
+#define STD_WEAK_PTR(T) std::shared_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_ENABLE_SHARED_FROM_THIS(T) std::tr1::enable_shared_from_this<T>
+#endif
+
//----------------------------------------------------------------------
// Define nub_addr_t and the invalid address value from the architecture
//----------------------------------------------------------------------
Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h Tue Mar 13 22:07:05 2012
@@ -16,7 +16,6 @@
#include <string>
#include <vector>
-#include <tr1/memory> // for std::tr1::shared_ptr
#include <libproc.h>
#include <mach/mach.h>
@@ -137,6 +136,6 @@
void HardwareWatchpointStateChanged(); // Provide a chance to update the global view of the hardware watchpoint state
};
-typedef std::tr1::shared_ptr<MachThread> MachThreadSP;
+typedef STD_SHARED_PTR(MachThread) MachThreadSP;
#endif
Modified: lldb/trunk/tools/debugserver/source/RNBDefs.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/RNBDefs.h?rev=152698&r1=152697&r2=152698&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/RNBDefs.h (original)
+++ lldb/trunk/tools/debugserver/source/RNBDefs.h Tue Mar 13 22:07:05 2012
@@ -16,8 +16,6 @@
#include "DNBDefs.h"
-#include <tr1/memory> // for std::tr1::shared_ptr
-
extern "C" const unsigned char debugserverVersionString[];
extern "C" const double debugserverVersionNumber;
#define DEBUGSERVER_PROGRAM_NAME "debugserver"
@@ -51,7 +49,7 @@
#endif
class RNBRemote;
-typedef std::tr1::shared_ptr<RNBRemote> RNBRemoteSP;
+typedef STD_SHARED_PTR(RNBRemote) RNBRemoteSP;
typedef enum
{
More information about the lldb-commits
mailing list