Patch by Matt Johnson to silence G++ warnings!

Used hand merge to apply the diffs.  I did not apply the diffs for FormatManager.h and
the diffs for memberwise initialization for ValueObject.cpp because they changed since.
I will ask my colleague to apply them later.

llvm-svn: 135508

1 files changed, 2 insertions, 2 deletions

diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index dd952c91b4b..97e73bd541e 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -168,7 +168,7 @@ ClangExpressionDeclMap::BuildIntegerVariable (const ConstString &name,
     if (num_bytes > num_data_bytes)
         num_bytes = num_data_bytes;
     
-    for (off_t byte_idx = 0;
+    for (size_t byte_idx = 0;
          byte_idx < num_bytes;
          ++byte_idx)
     {
@@ -915,7 +915,7 @@ ClangExpressionDeclMap::DoMaterialize
         if (log)
             log->PutCString("Not bothering to allocate a struct because no arguments are needed");
         
-        m_material_vars->m_allocated_area = NULL;
+        m_material_vars->m_allocated_area = 0;
         
         return true;
     }