[poppler] poppler/CertificateInfo.cc

[GitLab Mirror]

 poppler/CertificateInfo.cc |   13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit bcdb1219e302103b5676e007893a88c3707be26e
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Feb 1 15:22:47 2022 +0100

    Use default X509CertificateInfo::EntityInfo operator=

diff --git a/poppler/CertificateInfo.cc b/poppler/CertificateInfo.cc
index 6662de94..8b94e070 100644
--- a/poppler/CertificateInfo.cc
+++ b/poppler/CertificateInfo.cc
@@ -5,7 +5,7 @@
 // This file is licensed under the GPLv2 or later
 //
 // Copyright 2018 Chinmoy Ranjan Pradhan <chinmoyrp65 at gmail.com>
-// Copyright 2018, 2019 Albert Astals Cid <aacid at kde.org>
+// Copyright 2018, 2019, 2022 Albert Astals Cid <aacid at kde.org>
 // Copyright 2018 Oliver Sander <oliver.sander at tu-dresden.de>
 // Copyright 2020 Thorsten Behrens <Thorsten.Behrens at CIB.de>
 //
@@ -39,16 +39,7 @@ X509CertificateInfo::EntityInfo::~EntityInfo() = default;
 
 X509CertificateInfo::EntityInfo::EntityInfo(X509CertificateInfo::EntityInfo &&other) noexcept = default;
 
-// TODO when we stop supporting gcc 5.4 use this instead of the manually defined one
-// X509CertificateInfo::EntityInfo &X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo &&other) noexcept = default;
-X509CertificateInfo::EntityInfo &X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo &&other) noexcept
-{
-    commonName = std::move(other.commonName);
-    distinguishedName = std::move(other.distinguishedName);
-    email = std::move(other.email);
-    organization = std::move(other.organization);
-    return *this;
-}
+X509CertificateInfo::EntityInfo &X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo &&other) noexcept = default;
 
 X509CertificateInfo::X509CertificateInfo() : ku_extensions(KU_NONE), cert_version(-1), is_self_signed(false) { }