[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - external/poppler

[Michael Stahl]

 external/poppler/msvc2013.patch.1 |   55 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

New commits:
commit aa5f2f582521ac57b8b72a0a6e7b2a15a2d21257
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Thu Jun 28 14:51:25 2018 +0200

    poppler: try even harder to appease MSVC 2013
    
    It doesn't like "noexcept" keyword but you can't -Dnoexcept= because
    then the library headers complain that macroizing keywords is forbidden.
    
    Also, initialising std::atomic_int needs quite some hand-holding.
    
    Change-Id: Icf03df9dcfe4dd86f8cafda0feb1ebab81d4c1b4
    Reviewed-on: https://gerrit.libreoffice.org/56594
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/poppler/msvc2013.patch.1 b/external/poppler/msvc2013.patch.1
index b087589c4072..1d83a615b65b 100644
--- a/external/poppler/msvc2013.patch.1
+++ b/external/poppler/msvc2013.patch.1
@@ -21,3 +21,58 @@
  };
  
  class Dict {
+--- poppler/poppler/UnicodeMap.h.orig	2018-06-27 08:38:04.587184300 -0700
++++ poppler/poppler/UnicodeMap.h	2018-06-27 08:38:13.055134400 -0700
+@@ -73,10 +73,10 @@
+   UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
+ 	     UnicodeMapFunc funcA);
+ 
+-  UnicodeMap(UnicodeMap &&other) noexcept;
+-  UnicodeMap& operator=(UnicodeMap &&other) noexcept;
++  UnicodeMap(UnicodeMap &&other) ;
++  UnicodeMap& operator=(UnicodeMap &&other) ;
+ 
+-  void swap(UnicodeMap& other) noexcept;
++  void swap(UnicodeMap& other) ;
+ 
+   ~UnicodeMap();
+ 
+--- poppler/poppler/UnicodeMap.cc.orig	2018-06-27 08:43:49.625045400 -0700
++++ poppler/poppler/UnicodeMap.cc	2018-06-27 08:42:50.299038500 -0700
+@@ -175,14 +175,18 @@
+   }
+ }
+ 
+-UnicodeMap::UnicodeMap(UnicodeMap &&other) noexcept
++UnicodeMap::UnicodeMap(UnicodeMap &&other)
+   : encodingName{other.encodingName}
+   , kind{other.kind}
+   , unicodeOut{other.unicodeOut}
+   , len{other.len}
+   , eMaps{other.eMaps}
+   , eMapsLen{other.eMapsLen}
++#if defined _MSC_VER && _MSC_VER < 1900
++  , refCnt(std::atomic<int>(1))
++#else
+   , refCnt{1}
++#endif
+ {
+   switch (kind) {
+   case unicodeMapUser:
+@@ -198,14 +198,14 @@
+   other.eMaps = nullptr;
+ }
+ 
+-UnicodeMap& UnicodeMap::operator=(UnicodeMap &&other) noexcept
++UnicodeMap& UnicodeMap::operator=(UnicodeMap &&other)
+ {
+   if (this != &other)
+     swap(other);
+   return *this;
+ }
+ 
+-void UnicodeMap::swap(UnicodeMap &other) noexcept
++void UnicodeMap::swap(UnicodeMap &other)
+ {
+   using std::swap;
+   swap(encodingName, other.encodingName);