diff mbox series

[pushed] testsuite: fix Wmismatched-new-delete-8.C with -m32

Message ID 20240222235553.1411553-1-polacek@redhat.com
State New
Headers show
Series [pushed] testsuite: fix Wmismatched-new-delete-8.C with -m32 | expand

Commit Message

Marek Polacek Feb. 22, 2024, 11:55 p.m. UTC
Tested x86_64-pc-linux-gnu, applying to trunk.

-- >8 --
This fixes
error: 'operator new' takes type 'size_t' ('unsigned int') as first parameter [-fpermissive]

gcc/testsuite/ChangeLog:

	* g++.dg/warn/Wmismatched-new-delete-8.C: Use __SIZE_TYPE__.
---
 gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: 37127ed975e09813eaa2d1cf1062055fce45dd16

Comments

Andrew Pinski Feb. 23, 2024, 12:06 a.m. UTC | #1
On Thu, Feb 22, 2024, 15:56 Marek Polacek <polacek@redhat.com> wrote:

> Tested x86_64-pc-linux-gnu, applying to trunk.


I backported/pushed the change to 13 branch already so please apply it
there too.

Thanks,
Andrew




> -- >8 --
> This fixes
> error: 'operator new' takes type 'size_t' ('unsigned int') as first
> parameter [-fpermissive]
>
> gcc/testsuite/ChangeLog:
>
>         * g++.dg/warn/Wmismatched-new-delete-8.C: Use __SIZE_TYPE__.
> ---
>  gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C
> b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C
> index 0ddc056c6df..e8fd7a85b8c 100644
> --- a/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C
> +++ b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C
> @@ -11,7 +11,7 @@ static inline T * construct_at(void *at, ARGS && args)
>   struct Placeable : T
>   {
>    Placeable(ARGS && args) : T(args) { }
> -  void * operator new (long unsigned int, void *ptr) { return ptr; }
> +  void * operator new (__SIZE_TYPE__, void *ptr) { return ptr; }
>    void operator delete (void *, void *) { }
>   };
>   return new (at) Placeable(static_cast<ARGS &&>(args));
>
> base-commit: 37127ed975e09813eaa2d1cf1062055fce45dd16
> --
> 2.43.2
>
>
Marek Polacek Feb. 23, 2024, 12:09 a.m. UTC | #2
On Thu, Feb 22, 2024 at 04:06:51PM -0800, Andrew Pinski wrote:
> On Thu, Feb 22, 2024, 15:56 Marek Polacek <polacek@redhat.com> wrote:
> 
> > Tested x86_64-pc-linux-gnu, applying to trunk.
> 
> 
> I backported/pushed the change to 13 branch already so please apply it
> there too.

Ah right.  Done.

Marek
diff mbox series

Patch

diff --git a/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C
index 0ddc056c6df..e8fd7a85b8c 100644
--- a/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C
+++ b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C
@@ -11,7 +11,7 @@  static inline T * construct_at(void *at, ARGS && args)
  struct Placeable : T
  {
   Placeable(ARGS && args) : T(args) { }
-  void * operator new (long unsigned int, void *ptr) { return ptr; }
+  void * operator new (__SIZE_TYPE__, void *ptr) { return ptr; }
   void operator delete (void *, void *) { }
  };
  return new (at) Placeable(static_cast<ARGS &&>(args));