aboutsummaryrefslogtreecommitdiffstats
path: root/src/3rdparty/masm/assembler
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-09-06 18:04:12 +0200
committerUlf Hermann <ulf.hermann@qt.io>2022-09-07 16:56:28 +0200
commitd96aefcb515fc1604ab19ec4aa06e8d4d040df09 (patch)
tree5255b40e3fbab874cb3df0949c2cb5e708e80c0f /src/3rdparty/masm/assembler
parent9716c0187bff4d2742f0f304da93090347495486 (diff)
masm: Add copy ctors for LinkRecord
Having an implicit copy ctor and an explicit assignment operator is deprecated. Fixes: QTBUG-104077 Pick-to: 6.4 Change-Id: I03a08c71ac49d50728b1675f6f4533f4421f8126 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/3rdparty/masm/assembler')
-rw-r--r--src/3rdparty/masm/assembler/ARM64Assembler.h4
-rw-r--r--src/3rdparty/masm/assembler/ARMv7Assembler.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/masm/assembler/ARM64Assembler.h b/src/3rdparty/masm/assembler/ARM64Assembler.h
index 9928da3abd..847b0b09b0 100644
--- a/src/3rdparty/masm/assembler/ARM64Assembler.h
+++ b/src/3rdparty/masm/assembler/ARM64Assembler.h
@@ -657,6 +657,10 @@ public:
data.realTypes.m_bitNumber = bitNumber;
data.realTypes.m_compareRegister = compareRegister;
}
+ LinkRecord(const LinkRecord& other)
+ {
+ *this = other;
+ }
void operator=(const LinkRecord& other)
{
data.realTypes = other.data.realTypes;
diff --git a/src/3rdparty/masm/assembler/ARMv7Assembler.h b/src/3rdparty/masm/assembler/ARMv7Assembler.h
index 330b6c3629..fe0bc0ed74 100644
--- a/src/3rdparty/masm/assembler/ARMv7Assembler.h
+++ b/src/3rdparty/masm/assembler/ARMv7Assembler.h
@@ -481,6 +481,10 @@ public:
data.realTypes.m_linkType = LinkInvalid;
data.realTypes.m_condition = condition;
}
+ LinkRecord(const LinkRecord &other)
+ {
+ *this = other;
+ }
void operator=(const LinkRecord& other)
{
data.copyTypes.content[0] = other.data.copyTypes.content[0];