external/poppler/msvc2013.patch.1 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
New commits: commit 33c3b5aed8e5b5f8083520dda0e5df1b59d623da Author: Michael Stahl <[email protected]> Date: Tue Jun 26 10:39:24 2018 +0200 poppler: try harder to appease MSVC 2013 c:\lo\lode\dev\core\workdir\unpackedtarball\poppler\poppler\Dict.h(50) : error C2610: 'DictEntry::DictEntry(DictEntry &&)' : is not a special member function which can be defaulted https://stackoverflow.com/questions/24573963/move-constructor-invalid-type-for-defaulted-constructor-vs-2013 Change-Id: Id39de3d7577dcc1755e03a6f3adeccdce68c4415 Reviewed-on: https://gerrit.libreoffice.org/56445 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> diff --git a/external/poppler/msvc2013.patch.1 b/external/poppler/msvc2013.patch.1 index 8c31baf873fc..b087589c4072 100644 --- a/external/poppler/msvc2013.patch.1 +++ b/external/poppler/msvc2013.patch.1 @@ -1,14 +1,23 @@ --- poppler/poppler/Dict.h.orig 2018-06-25 13:58:43.086965564 +0200 +++ poppler/poppler/Dict.h 2018-06-25 13:55:44.353387730 +0200 -@@ -44,6 +44,11 @@ +@@ -44,6 +44,20 @@ struct DictEntry { char *key; Object val; + // appease MSVC2013 + DictEntry(DictEntry const&) = delete; + DictEntry& operator=(DictEntry const&) = delete; -+ DictEntry(DictEntry &&) = default; -+ DictEntry& operator=(DictEntry &&) = default; ++ DictEntry(DictEntry && other) //= default; ++ : key(other.key), val(std::move(other.val)) { other.key = nullptr; } ++ DictEntry& operator=(DictEntry && other) //= default; ++ { ++ if (this != &other) { ++ key = other.key; ++ other.key = nullptr; ++ val = std::move(other.val); ++ } ++ return *this; ++ } }; class Dict { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
