From bc99f84478f7466de583614656a003c0e1979101 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 27 Mar 2023 16:33:12 -0600
Subject: [PATCH] IPC: QSharedMemory: use q20::construct_at

Commit 72c2cdbc572f8b8b45a57a451e2bc19bb1c53b0c said "Move the helper
from qsharedmemory.cpp" but didn't actually move it probably because
commit 72c2cdbc572 got cherry-picked to 6.5 but the original
introduction to qsharedmemory.cpp didn't.

So do it now.

Change-Id: Idd5e1bb52be047d7b4fffffd175067701d4ea58c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/corelib/ipc/qsharedmemory.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/corelib/ipc/qsharedmemory.cpp b/src/corelib/ipc/qsharedmemory.cpp
index 9e33b1d995..139c1440e3 100644
--- a/src/corelib/ipc/qsharedmemory.cpp
+++ b/src/corelib/ipc/qsharedmemory.cpp
@@ -7,6 +7,7 @@
 #include "qtipccommon_p.h"
 #include "qsystemsemaphore.h"
 
+#include <q20memory.h>
 #include <qdebug.h>
 #ifdef Q_OS_WIN
 #  include <qt_windows.h>
@@ -23,15 +24,6 @@ QT_BEGIN_NAMESPACE
 using namespace QtIpcCommon;
 using namespace Qt::StringLiterals;
 
-#if __cplusplus >= 202002L
-using std::construct_at;
-#else
-template <typename T> static void construct_at(T *ptr)
-{
-    new (ptr) T;
-}
-#endif
-
 QSharedMemoryPrivate::~QSharedMemoryPrivate()
 {
     destructBackend();
@@ -39,6 +31,7 @@ QSharedMemoryPrivate::~QSharedMemoryPrivate()
 
 inline void QSharedMemoryPrivate::constructBackend()
 {
+    using namespace q20;
     visit([](auto p) { construct_at(p); });
 }