commit bcd4b5521d9da29a617d2ef16cae68cf1750f6e0
author David Blaikie <dblaikie@gmail.com> Sat Feb 16 00:56:22 2013 +0000
committer David Blaikie <dblaikie@gmail.com> Sat Feb 16 00:56:22 2013 +0000
tree 21bbb7f5db51ce9d95113bb160a9c0e2e2ff5d6c
parent 65fd2a4e905daf579a5497ed9cd1d177e96f3e10

Don't warn on conversion from NULL to nullptr_t

llvm-svn: 175331

clang/test/SemaCXX/conversion.cpp

diff --git a/clang/test/SemaCXX/conversion.cpp b/clang/test/SemaCXX/conversion.cpp
index ac235cc..852bbba 100644
--- a/clang/test/SemaCXX/conversion.cpp
+++ b/clang/test/SemaCXX/conversion.cpp
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -Wconversion -verify %s
-// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -Wconversion %s 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -Wconversion -std=c++11 -verify %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -Wconversion -std=c++11 %s 2>&1 | FileCheck %s
 
 #include <stddef.h>
 
@@ -131,3 +131,9 @@
 
   template void func<3>();
 }
+
+namespace test6 {
+  decltype(nullptr) func() {
+    return NULL;
+  }
+}