aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAndrea Azzarone <azzaronea@gmail.com>2015-02-19 13:45:25 +0000
committerJakub Jelinek <jakub@gcc.gnu.org>2015-02-19 14:45:25 +0100
commit97953c118b29aea7df7428da0da926e79167fbec (patch)
tree4a64fbd93076e54e99577689047b24250e0512f5 /gcc
parent49d8897995ee841fa8269bc099035c3ac8fa576c (diff)
downloadgcc-97953c118b29aea7df7428da0da926e79167fbec.zip
gcc-97953c118b29aea7df7428da0da926e79167fbec.tar.gz
gcc-97953c118b29aea7df7428da0da926e79167fbec.tar.bz2
* g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C
(size_type): New typedef. (operator "" _script): Use it for the last argument. From-SVN: r220814
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C4
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c3570c..a2ca2c8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-19 Andrea Azzarone <azzaronea@gmail.com>
+
+ * g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C
+ (size_type): New typedef.
+ (operator "" _script): Use it for the last argument.
+
2015-02-19 Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
* gcc.dg/pr64935-1.c, gcc.dg/pr64935-2.c: New tests.
diff --git a/gcc/testsuite/g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C b/gcc/testsuite/g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C
index 2eb6a7d..6e3ffe4 100644
--- a/gcc/testsuite/g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C
+++ b/gcc/testsuite/g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C
@@ -2,12 +2,14 @@
#include <cassert>
+typedef decltype(sizeof(0)) size_type;
+
template<typename CharT, CharT... String>
int operator"" _script () {
return 1;
}
-int operator"" _script (const char*, unsigned long) {
+int operator"" _script (const char*, size_type) {
return 2;
}