[Lldb-commits] [lldb] r135523 - in /lldb/trunk: include/lldb/Core/FormatManager.h source/Core/ValueObject.cpp

[Enrico Granata]

Author: enrico
Date: Tue Jul 19 15:57:44 2011
New Revision: 135523

URL: http://llvm.org/viewvc/llvm-project?rev=135523&view=rev
Log:
Applied Matt Johnson patch to ValueObject and FormatManager

Modified:
    lldb/trunk/include/lldb/Core/FormatManager.h
    lldb/trunk/source/Core/ValueObject.cpp

Modified: lldb/trunk/include/lldb/Core/FormatManager.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatManager.h?rev=135523&r1=135522&r2=135523&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FormatManager.h (original)
+++ lldb/trunk/include/lldb/Core/FormatManager.h Tue Jul 19 15:57:44 2011
@@ -77,19 +77,20 @@
 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;
+    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 @@
     }
 
 public:
-
-    typedef typename MapType::iterator MapIterator;
-    typedef bool(*CallbackType)(void*, KeyType, const ValueSP&);
     
     FormatMap(IFormatChangeListener* lst = NULL) :
     m_map(),

Modified: lldb/trunk/source/Core/ValueObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=135523&r1=135522&r2=135523&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObject.cpp (original)
+++ lldb/trunk/source/Core/ValueObject.cpp Tue Jul 19 15:57:44 2011
@@ -72,6 +72,11 @@
     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 @@
     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 @@
     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 @@
     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();