[Lldb-commits] [lldb] r167774 - in /lldb/trunk: include/lldb/Symbol/Type.h source/Symbol/Type.cpp

[Greg Clayton]

Author: gclayton
Date: Mon Nov 12 16:54:26 2012
New Revision: 167774

URL: http://llvm.org/viewvc/llvm-project?rev=167774&view=rev
Log:
New compiler warnings caught issues with the m_encoding_uid field that should have been a lldb::user_id_t type, but was a uint32_t a long time ago and never got updated.


Modified:
    lldb/trunk/include/lldb/Symbol/Type.h
    lldb/trunk/source/Symbol/Type.cpp

Modified: lldb/trunk/include/lldb/Symbol/Type.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Type.h?rev=167774&r1=167773&r2=167774&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/Type.h (original)
+++ lldb/trunk/include/lldb/Symbol/Type.h Mon Nov 12 16:54:26 2012
@@ -302,7 +302,7 @@
     SymbolFile *m_symbol_file;
     SymbolContextScope *m_context; // The symbol context in which this type is defined
     Type *m_encoding_type;
-    uint32_t m_encoding_uid;
+    lldb::user_id_t m_encoding_uid;
     EncodingDataType m_encoding_uid_type;
     uint32_t m_byte_size;
     Declaration m_decl;

Modified: lldb/trunk/source/Symbol/Type.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Type.cpp?rev=167774&r1=167773&r2=167774&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/Type.cpp (original)
+++ lldb/trunk/source/Symbol/Type.cpp Mon Nov 12 16:54:26 2012
@@ -80,7 +80,7 @@
     m_symbol_file (NULL),
     m_context (NULL),
     m_encoding_type (NULL),
-    m_encoding_uid (0),
+    m_encoding_uid (LLDB_INVALID_UID),
     m_encoding_uid_type (eEncodingInvalid),
     m_byte_size (0),
     m_decl (),
@@ -150,7 +150,7 @@
     }
     else if (m_encoding_uid != LLDB_INVALID_UID)
     {
-        s->Printf(", type_uid = 0x%8.8x", m_encoding_uid);
+        s->Printf(", type_uid = 0x%8.8llx", m_encoding_uid);
         switch (m_encoding_uid_type)
         {
         case eEncodingInvalid: break;