[Libreoffice-commits] core.git: include/editeng

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 1 14:26:33 UTC 2021


 include/editeng/svxrtf.hxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit c275617a9d547e13def33e3d06068c08bf492f78
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jun 1 13:53:14 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jun 1 16:25:47 2021 +0200

    Avoid -Werror,-Wdeprecated-copy
    
    ...at least on macOS against LLVM 13 trunk libc++,
    
    > In file included from ~/lo/core/editeng/source/rtf/svxrtf.cxx:35:
    > ~/lo/core/include/editeng/svxrtf.hxx:66:5: error: definition of implicit copy assignment operator for 'EditPosition' is deprecated because it has a user-declared copy constructor [-Werror,-Wdeprecated-copy]
    >     EditPosition(const EditPosition &) = default;
    >     ^
    > ~/llvm/inst/bin/../include/c++/v1/optional:790:27: note: in implicit copy assignment operator for 'EditPosition' first required here
    >             this->__get() = _VSTD::forward<_Up>(__v);
    >                           ^
    > ~/lo/core/editeng/source/rtf/svxrtf.cxx:86:22: note: in instantiation of function template specialization 'std::optional<EditPosition>::operator=<const EditPosition &, void>' requested here
    >     mxInsertPosition = rNew;
    >                      ^
    
    21ad3e6cbdf9568c1152a2eab8178e4219e40c33 "EditPosition does not need to be
    allocated separately" had introduced the defaulted copy ctor, for no apparent
    reason.
    
    Change-Id: If61743c4e873a5ac95ba72a4ae24160f8713205f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116535
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 87283eadf11d..d19c542885bf 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -63,7 +63,6 @@ private:
 
 public:
     EditPosition(EditEngine* pIEE, EditSelection* pSel);
-    EditPosition(const EditPosition &) = default;
 
     sal_Int32   GetNodeIdx() const;
     sal_Int32   GetCntIdx() const;


More information about the Libreoffice-commits mailing list