[llvm-branch-commits] [cfe-branch] r118580 - in /cfe/branches/Apple/whitney: include/clang/Basic/TokenKinds.def test/SemaCXX/nullptr-98.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Nov  9 11:32:56 2010
New Revision: 118580

URL: http://llvm.org/viewvc/llvm-project?rev=118580&view=rev
Log:
Merge r118482:
--
Author: Douglas Gregor <dgregor at apple.com>
Date:   Tue Nov 9 03:43:04 2010 +0000

    Add __nullptr as a C++0x nullptr literal, available in C++98

Added:
    cfe/branches/Apple/whitney/test/SemaCXX/nullptr-98.cpp
Modified:
    cfe/branches/Apple/whitney/include/clang/Basic/TokenKinds.def

Modified: cfe/branches/Apple/whitney/include/clang/Basic/TokenKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/include/clang/Basic/TokenKinds.def?rev=118580&r1=118579&r2=118580&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/include/clang/Basic/TokenKinds.def (original)
+++ cfe/branches/Apple/whitney/include/clang/Basic/TokenKinds.def Tue Nov  9 11:32:56 2010
@@ -358,6 +358,7 @@
 ALIAS("__imag__"     , __imag     , KEYALL)
 ALIAS("__inline"     , inline     , KEYALL)
 ALIAS("__inline__"   , inline     , KEYALL)
+ALIAS("__nullptr"    , nullptr      , KEYCXX)
 ALIAS("__real__"     , __real     , KEYALL)
 ALIAS("__restrict"   , restrict   , KEYALL)
 ALIAS("__restrict__" , restrict   , KEYALL)

Added: cfe/branches/Apple/whitney/test/SemaCXX/nullptr-98.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/SemaCXX/nullptr-98.cpp?rev=118580&view=auto
==============================================================================
--- cfe/branches/Apple/whitney/test/SemaCXX/nullptr-98.cpp (added)
+++ cfe/branches/Apple/whitney/test/SemaCXX/nullptr-98.cpp Tue Nov  9 11:32:56 2010
@@ -0,0 +1,3 @@
+// RUN: %clang_cc1 -std=c++98 -fsyntax-only -verify %s
+void f(void *);
+void g() { f(__nullptr); }