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, 4 insertions, 4 deletions

diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp
index 359b011c546..d8d65bc379f 100644
--- a/lldb/source/Expression/ClangUserExpression.cpp
+++ b/lldb/source/Expression/ClangUserExpression.cpp
@@ -413,8 +413,8 @@ ClangUserExpression::GetThreadPlanToExecuteJITExpression (Stream &error_stream,
 {
     lldb::addr_t struct_address;
             
-    lldb::addr_t object_ptr = NULL;
-    lldb::addr_t cmd_ptr = NULL;
+    lldb::addr_t object_ptr = 0;
+    lldb::addr_t cmd_ptr = 0;
     
     PrepareToExecuteJITExpression (error_stream, exe_ctx, struct_address, object_ptr, cmd_ptr);
     
@@ -494,8 +494,8 @@ ClangUserExpression::Execute (Stream &error_stream,
     {
         lldb::addr_t struct_address;
                 
-        lldb::addr_t object_ptr = NULL;
-        lldb::addr_t cmd_ptr = NULL;
+        lldb::addr_t object_ptr = 0;
+        lldb::addr_t cmd_ptr = 0;
         
         if (!PrepareToExecuteJITExpression (error_stream, exe_ctx, struct_address, object_ptr, cmd_ptr))
             return eExecutionSetupError;