summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaCXX/cxx98-compat-pedantic.cpp
diff options
context:
space:
mode:
authorLarisse Voufo <lvoufo@google.com>2013-06-17 18:41:38 +0000
committerLarisse Voufo <lvoufo@google.com>2013-06-17 18:41:38 +0000
commit249f9277a414b79fc121666c61059607210e60d2 (patch)
tree2e0400ebc7de7000c28b4dd92c4e7c99e8e4dffa /clang/test/SemaCXX/cxx98-compat-pedantic.cpp
parent55ab87f151fbb5890cf75f0614ab1ab7ea21aa02 (diff)
downloadbcm5719-llvm-249f9277a414b79fc121666c61059607210e60d2.tar.gz
bcm5719-llvm-249f9277a414b79fc121666c61059607210e60d2.zip
Updated test cases for contextual conversion
llvm-svn: 184100
Diffstat (limited to 'clang/test/SemaCXX/cxx98-compat-pedantic.cpp')
-rw-r--r--clang/test/SemaCXX/cxx98-compat-pedantic.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/SemaCXX/cxx98-compat-pedantic.cpp b/clang/test/SemaCXX/cxx98-compat-pedantic.cpp
index 5fe7980994e..50ce6a49002 100644
--- a/clang/test/SemaCXX/cxx98-compat-pedantic.cpp
+++ b/clang/test/SemaCXX/cxx98-compat-pedantic.cpp
@@ -34,7 +34,7 @@ struct ConvertToInt {
};
int *ArraySizeConversion = new int[ConvertToInt()];
#ifdef CXX1Y2
-// expected-warning@-2 {{implicit conversion from array size expression of type 'ConvertToInt' to integral type}} // 'unsigned long' is incompatible with C++98}}
+// expected-warning@-2 {{implicit conversion from array size expression of type 'ConvertToInt' to integral type 'size_t' is incompatible with C++98}}
#else
// expected-warning@-4 {{implicit conversion from array size expression of type 'ConvertToInt' to integral type 'int' is incompatible with C++98}}
#endif
OpenPOWER on IntegriCloud