aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tom@codesourcery.com>2016-08-28 22:02:07 +0000
committerTom de Vries <tom@codesourcery.com>2016-08-28 22:02:07 +0000
commit6f4b0c16dbed482ed523d9fad5587e7b9db52b4e (patch)
treec7f6612d4dde2668972f36d4644567428ba4617a
parent88725f800899843ff17133d9dda0749df2fc7a08 (diff)
2016-08-28 Tom de Vries <tom@codesourcery.com>
PR testsuite/77034 Backported from mainline 2016-07-25 Jason Merrill <jason@redhat.com> * g++.dg/init/elide5.C (operator new): Use decltype(sizeof(1)) instead of unsigned long. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@239811 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/testsuite/ChangeLog9
-rw-r--r--gcc/testsuite/g++.dg/init/elide5.C3
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 279891c607b..410ddf21165 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2016-08-28 Tom de Vries <tom@codesourcery.com>
+
+ PR testsuite/77034
+ Backported from mainline
+ 2016-07-25 Jason Merrill <jason@redhat.com>
+
+ * g++.dg/init/elide5.C (operator new): Use decltype(sizeof(1)) instead
+ of unsigned long.
+
2016-08-26 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
Backport from mainline
diff --git a/gcc/testsuite/g++.dg/init/elide5.C b/gcc/testsuite/g++.dg/init/elide5.C
index 0a9978ca661..e52d55fae68 100644
--- a/gcc/testsuite/g++.dg/init/elide5.C
+++ b/gcc/testsuite/g++.dg/init/elide5.C
@@ -1,7 +1,7 @@
// PR c++/71913
// { dg-do link { target c++11 } }
-void* operator new(unsigned long, void* p) { return p; }
+void* operator new(decltype(sizeof(1)), void* p) { return p; }
struct IndirectReturn {
IndirectReturn() {}
@@ -24,4 +24,3 @@ int main()
{
bar(c);
}
-