maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Applied Matt Johnson patch to ValueObject and FormatManager 

llvm-svn: 135523
This commit is contained in:
Enrico Granata 2011-07-19 20:57:44 +00:00
parent 9663dd3f00
commit 9df29e32c9
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lldb/include/lldb/Core/FormatManager.h
View File

@ -77,19 +77,20 @@ class FormatNavigator;
template<typename KeyType, typename ValueType>
class FormatMap
{
private:
typedef typename ValueType::SharedPointer ValueSP;
Mutex m_map_mutex;
IFormatChangeListener* listener;
friend class FormatNavigator<KeyType, ValueType>;
friend class FormatManager;
public:
typedef std::map<KeyType, ValueSP> MapType;
private:
MapType m_map;
public:
typedef typename ValueType::SharedPointer ValueSP;
typedef std::map<KeyType, ValueSP> MapType;
typedef typename MapType::iterator MapIterator;
typedef bool(*CallbackType)(void*, KeyType, const ValueSP&);
private:
MapType m_map;
Mutex m_map_mutex;
IFormatChangeListener* listener;
MapType& map()
{
@ -102,9 +103,6 @@ private:
}
public:
typedef typename MapType::iterator MapIterator;
typedef bool(*CallbackType)(void*, KeyType, const ValueSP&);
FormatMap(IFormatChangeListener* lst = NULL) :
m_map(),

18
lldb/source/Core/ValueObject.cpp
View File

@ -72,6 +72,11 @@ ValueObject::ValueObject (ValueObject &parent) :
m_dynamic_value (NULL),
m_deref_valobj(NULL),
m_format (eFormatDefault),
m_last_format_mgr_revision(0),
m_last_summary_format(),
m_forced_summary_format(),
m_last_value_format(),
m_user_id_of_forced_summary(0),
m_value_is_valid (false),
m_value_did_change (false),
m_children_count_valid (false),
@ -80,10 +85,6 @@ ValueObject::ValueObject (ValueObject &parent) :
m_is_deref_of_parent (false),
m_is_array_item_for_pointer(false),
m_is_bitfield_for_scalar(false),
m_last_format_mgr_revision(0),
m_last_value_format(),
m_last_summary_format(),
m_forced_summary_format(),
m_dump_printable_counter(0)
{
m_manager->ManageObject(this);
@ -111,6 +112,11 @@ ValueObject::ValueObject (ExecutionContextScope *exe_scope) :
m_dynamic_value (NULL),
m_deref_valobj(NULL),
m_format (eFormatDefault),
m_last_format_mgr_revision(0),
m_last_summary_format(),
m_forced_summary_format(),
m_last_value_format(),
m_user_id_of_forced_summary(0),
m_value_is_valid (false),
m_value_did_change (false),
m_children_count_valid (false),
@ -119,10 +125,6 @@ ValueObject::ValueObject (ExecutionContextScope *exe_scope) :
m_is_deref_of_parent (false),
m_is_array_item_for_pointer(false),
m_is_bitfield_for_scalar(false),
m_last_format_mgr_revision(0),
m_last_value_format(),
m_last_summary_format(),
m_forced_summary_format(),
m_dump_printable_counter(0)
{
m_manager = new ValueObjectManager();