Fixed some extra warnings that show up with the new clang.

llvm-svn: 145735

5 files changed, 15 insertions, 15 deletions

diff --git a/lldb/include/lldb/Breakpoint/StoppointLocation.h b/lldb/include/lldb/Breakpoint/StoppointLocation.h
index c42ea9f2b97..dbc4f961f87 100644
--- a/lldb/include/lldb/Breakpoint/StoppointLocation.h
+++ b/lldb/include/lldb/Breakpoint/StoppointLocation.h
@@ -32,7 +32,7 @@ public:
 
     StoppointLocation (lldb::break_id_t bid,
                        lldb::addr_t m_addr,
-                       size_t size,
+                       uint32_t byte_size,
                        bool hardware);
 
     virtual
@@ -57,7 +57,7 @@ public:
         return m_addr;
     }
 
-    size_t
+    uint32_t
     GetByteSize () const
     {
         return m_byte_size;
diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp
index 76a3c9d06e0..ce8109fa090 100644
--- a/lldb/source/API/SBProcess.cpp
+++ b/lldb/source/API/SBProcess.cpp
@@ -732,7 +732,7 @@ SBProcess::ReadMemory (addr_t addr, void *dst, size_t dst_len, SBError &sb_error
                      m_opaque_sp.get(), 
                      addr, 
                      dst, 
-                     (uint32_t) dst_len, 
+                     dst_len, 
                      sb_error.get());
     }
 
@@ -752,14 +752,14 @@ SBProcess::ReadMemory (addr_t addr, void *dst, size_t dst_len, SBError &sb_error
     {
         SBStream sstr;
         sb_error.GetDescription (sstr);
-        log->Printf ("SBProcess(%p)::ReadMemory (addr=0x%llx, dst=%p, dst_len=%zu, SBError (%p): %s) => %d", 
+        log->Printf ("SBProcess(%p)::ReadMemory (addr=0x%llx, dst=%p, dst_len=%zu, SBError (%p): %s) => %zu", 
                      m_opaque_sp.get(), 
                      addr, 
                      dst, 
-                     (uint32_t) dst_len, 
+                     dst_len, 
                      sb_error.get(), 
                      sstr.GetData(),
-                     (uint32_t) bytes_read);
+                     bytes_read);
     }
 
     return bytes_read;
@@ -777,7 +777,7 @@ SBProcess::WriteMemory (addr_t addr, const void *src, size_t src_len, SBError &s
                      m_opaque_sp.get(), 
                      addr, 
                      src, 
-                     (uint32_t) src_len, 
+                     src_len, 
                      sb_error.get());
     }
 
@@ -793,14 +793,14 @@ SBProcess::WriteMemory (addr_t addr, const void *src, size_t src_len, SBError &s
     {
         SBStream sstr;
         sb_error.GetDescription (sstr);
-        log->Printf ("SBProcess(%p)::WriteMemory (addr=0x%llx, src=%p, dst_len=%zu, SBError (%p): %s) => %d", 
+        log->Printf ("SBProcess(%p)::WriteMemory (addr=0x%llx, src=%p, dst_len=%zu, SBError (%p): %s) => %zu", 
                      m_opaque_sp.get(), 
                      addr, 
                      src, 
-                     (uint32_t) src_len, 
+                     src_len, 
                      sb_error.get(), 
                      sstr.GetData(),
-                     (uint32_t) bytes_written);
+                     bytes_written);
     }
 
     return bytes_written;
diff --git a/lldb/source/Breakpoint/StoppointLocation.cpp b/lldb/source/Breakpoint/StoppointLocation.cpp
index 5613f90619c..092caa5a932 100644
--- a/lldb/source/Breakpoint/StoppointLocation.cpp
+++ b/lldb/source/Breakpoint/StoppointLocation.cpp
@@ -30,12 +30,12 @@ StoppointLocation::StoppointLocation (break_id_t bid, addr_t addr, bool hardware
 {
 }
 
-StoppointLocation::StoppointLocation (break_id_t bid, addr_t addr, size_t size, bool hardware) :
+StoppointLocation::StoppointLocation (break_id_t bid, addr_t addr, uint32_t byte_size, bool hardware) :
     m_loc_id(bid),
     m_addr(addr),
     m_hw_preferred(hardware),
     m_hw_index(LLDB_INVALID_INDEX32),
-    m_byte_size(size),
+    m_byte_size(byte_size),
     m_hit_count(0)
 {
 }
diff --git a/lldb/source/Breakpoint/Watchpoint.cpp b/lldb/source/Breakpoint/Watchpoint.cpp
index f7a8d651ec5..4645b6072e0 100644
--- a/lldb/source/Breakpoint/Watchpoint.cpp
+++ b/lldb/source/Breakpoint/Watchpoint.cpp
@@ -112,7 +112,7 @@ Watchpoint::DumpWithLevel(Stream *s, lldb::DescriptionLevel description_level) c
     assert(description_level >= lldb::eDescriptionLevelBrief &&
            description_level <= lldb::eDescriptionLevelVerbose);
 
-    s->Printf("Watchpoint %u: addr = 0x%8.8llx size = %zu state = %s type = %s%s",
+    s->Printf("Watchpoint %u: addr = 0x%8.8llx size = %u state = %s type = %s%s",
               GetID(),
               (uint64_t)m_addr,
               m_byte_size,
diff --git a/lldb/source/Symbol/Type.cpp b/lldb/source/Symbol/Type.cpp
index abb7e738c49..706e4defa27 100644
--- a/lldb/source/Symbol/Type.cpp
+++ b/lldb/source/Symbol/Type.cpp
@@ -109,7 +109,7 @@ Type::GetDescription (Stream *s, lldb::DescriptionLevel level, bool show_name)
 
     // Call the get byte size accesor so we resolve our byte size
     if (GetByteSize())
-        s->Printf(", byte-size = %zu", m_byte_size);
+        s->Printf(", byte-size = %u", m_byte_size);
     bool show_fullpaths = (level == lldb::eDescriptionLevelVerbose);
     m_decl.Dump(s, show_fullpaths);
 
@@ -149,7 +149,7 @@ Type::Dump (Stream *s, bool show_context)
         *s << ", name = \"" << m_name << "\"";
 
     if (m_byte_size != 0)
-        s->Printf(", size = %zu", m_byte_size);
+        s->Printf(", size = %u", m_byte_size);
 
     if (show_context && m_context != NULL)
     {