summaryrefslogtreecommitdiff
path: root/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
commit37aba4797703ebadbd480b757ce40b81036539bc (patch)
treec7c6d9a3497dd1fe2de25647e989f5a6ae5ad50e /test/SemaCXX/cxx98-compat-pedantic.cpp
parent5c8a92ef245c773fa56e66a8c88ae9393eea2fb6 (diff)
downloadclang-37aba4797703ebadbd480b757ce40b81036539bc.tar.gz
Updated test cases for contextual conversion
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@184100 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/SemaCXX/cxx98-compat-pedantic.cpp')
-rw-r--r--test/SemaCXX/cxx98-compat-pedantic.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/SemaCXX/cxx98-compat-pedantic.cpp b/test/SemaCXX/cxx98-compat-pedantic.cpp
index 5fe7980994..50ce6a4900 100644
--- a/test/SemaCXX/cxx98-compat-pedantic.cpp
+++ b/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