summaryrefslogtreecommitdiffstats
path: root/clang/test
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2013-02-16 00:56:22 +0000
committerDavid Blaikie <dblaikie@gmail.com>2013-02-16 00:56:22 +0000
commitbcd4b5521d9da29a617d2ef16cae68cf1750f6e0 (patch)
tree21bbb7f5db51ce9d95113bb160a9c0e2e2ff5d6c /clang/test
parent65fd2a4e905daf579a5497ed9cd1d177e96f3e10 (diff)
downloadbcm5719-llvm-bcd4b5521d9da29a617d2ef16cae68cf1750f6e0.tar.gz
bcm5719-llvm-bcd4b5521d9da29a617d2ef16cae68cf1750f6e0.zip
Don't warn on conversion from NULL to nullptr_t
llvm-svn: 175331
Diffstat (limited to 'clang/test')
-rw-r--r--clang/test/SemaCXX/conversion.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/clang/test/SemaCXX/conversion.cpp b/clang/test/SemaCXX/conversion.cpp
index ac235cc7fea..852bbba7efa 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 @@ namespace test5 {
template void func<3>();
}
+
+namespace test6 {
+ decltype(nullptr) func() {
+ return NULL;
+ }
+}
OpenPOWER on IntegriCloud