[Lldb-commits] [lldb] r157758 - /lldb/trunk/source/Expression/ExpressionSourceCode.cpp

[Sean Callanan]

Author: spyffe
Date: Thu May 31 12:49:31 2012
New Revision: 157758

URL: http://llvm.org/viewvc/llvm-project?rev=157758&view=rev
Log:
Made nil resolve as (id)0 and not be looked up
(which regularly conflicts with existing symbols
in Objective-C).

Modified:
    lldb/trunk/source/Expression/ExpressionSourceCode.cpp

Modified: lldb/trunk/source/Expression/ExpressionSourceCode.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ExpressionSourceCode.cpp?rev=157758&r1=157757&r2=157758&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ExpressionSourceCode.cpp (original)
+++ lldb/trunk/source/Expression/ExpressionSourceCode.cpp Thu May 31 12:49:31 2012
@@ -37,6 +37,8 @@
             wrap_stream.Printf("%s                             \n"
                                "#undef NULL                    \n"
                                "#define NULL 0                 \n"
+                               "#undef nil                     \n"
+                               "#define nil (id)0              \n"
                                "typedef unsigned short unichar;\n"
                                "void                           \n"
                                "%s(void *$__lldb_arg)          \n"
@@ -51,6 +53,8 @@
             wrap_stream.Printf("%s                                     \n"
                                "#undef NULL                            \n"
                                "#define NULL 0                         \n"
+                               "#undef nil                             \n"
+                               "#define nil (id)0                      \n"
                                "typedef unsigned short unichar;        \n"
                                "void                                   \n"
                                "$__lldb_class::%s(void *$__lldb_arg) %s\n"
@@ -68,6 +72,8 @@
                 wrap_stream.Printf("%s                                                      \n"
                                     "#undef NULL                                            \n"
                                     "#define NULL 0                                         \n"
+                                    "#undef nil                                             \n"
+                                    "#define nil (id)0                                      \n"
                                     "typedef unsigned short unichar;                        \n"
                                     "@interface $__lldb_objc_class ($__lldb_category)       \n"
                                     "+(void)%s:(void *)$__lldb_arg;                         \n"
@@ -88,6 +94,8 @@
                 wrap_stream.Printf("%s                                                     \n"
                                    "#undef NULL                                            \n"
                                    "#define NULL 0                                         \n"
+                                   "#undef nil                                             \n"
+                                   "#define nil (id)0                                      \n"
                                    "typedef unsigned short unichar;                        \n"
                                    "@interface $__lldb_objc_class ($__lldb_category)       \n"
                                    "-(void)%s:(void *)$__lldb_arg;                         \n"