external/libetonyek/0002-fix-build-with-MSVC.patch.1

   1 From 7b69af66227309e9c258beca3bc3934be454a221 Mon Sep 17 00:00:00 2001
   2 From: David Tardon <dtardon@redhat.com>
   3 Date: Wed, 19 May 2021 21:11:40 +0200
   4 Subject: [PATCH] fix build with MSVC
   5
   6 C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\xutility(138): error C2668: 'libetonyek::IWORKStyle::IWORKStyle': ambiguous call to overloaded function
   7 C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\libetonyek\src\lib\IWORKStyle.h(32): note: could be 'libetonyek::IWORKStyle::IWORKStyle(const libetonyek::IWORKPropertyMap &,const boost::optional<std::string> &,const libetonyek::IWORKStylePtr_t &)'
   8 C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\libetonyek\src\lib\IWORKStyle.h(31): note: or       'libetonyek::IWORKStyle::IWORKStyle(const libetonyek::IWORKPropertyMap &,const boost::optional<std::string> &,const boost::optional<std::string> &)'
   9 C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\xutility(137): note: while trying to match the argument list '(libetonyek::IWORKPropertyMap, const boost::none_t, _Ty)'
  10         with
  11         [
  12             _Ty=nullptr
  13         ]
  14 C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\memory(2186): note: see reference to function template instantiation 'void std::_Construct_in_place<_Ty,libetonyek::IWORKPropertyMap&,const boost::none_t&,nullptr>(_Ty &,libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&) noexcept(false)' being compiled
  15         with
  16         [
  17             _Ty=libetonyek::IWORKStyle
  18         ]
  19 C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\memory(2906): note: see reference to function template instantiation 'std::_Ref_count_obj2<_Ty>::_Ref_count_obj2<libetonyek::IWORKPropertyMap&,const boost::none_t&,nullptr>(libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&)' being compiled
  20         with
  21         [
  22             _Ty=libetonyek::IWORKStyle
  23         ]
  24 C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1428~1.299/Include\memory(2907): note: see reference to function template instantiation 'std::_Ref_count_obj2<_Ty>::_Ref_count_obj2<libetonyek::IWORKPropertyMap&,const boost::none_t&,nullptr>(libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&)' being compiled
  25         with
  26         [
  27             _Ty=libetonyek::IWORKStyle
  28         ]
  29 C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/libetonyek/src/lib/IWAParser.cpp(2358): note: see reference to function template instantiation 'std::shared_ptr<libetonyek::IWORKStyle> std::make_shared<libetonyek::IWORKStyle,libetonyek::IWORKPropertyMap&,const boost::none_t&,nullptr>(libetonyek::IWORKPropertyMap &,const boost::none_t &,nullptr &&)' being compiled
  30
  31 Change-Id: Idf871474b2a20f252073846388d018cccc15bc11
  32 ---
  33  src/lib/IWAParser.cpp | 4 ++--
  34  1 file changed, 2 insertions(+), 2 deletions(-)
  35
  36 diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp
  37 index a2bd292..1fdeae7 100644
  38 --- a/src/lib/IWAParser.cpp
  39 +++ b/src/lib/IWAParser.cpp
  40 @@ -2355,10 +2355,10 @@ void IWAParser::parseAuthorInComment(unsigned id)
  41      IWORKPropertyMap props;
  42      // normally yellow, but blue may be better in LO
  43      props.put<property::FontColor>(IWORKColor(0,0,1,1));
  44 -    spans[0]=std::make_shared<IWORKStyle>(props, boost::none, nullptr);
  45 +    spans[0]=std::make_shared<IWORKStyle>(props, boost::none, IWORKStylePtr_t());
  46      // reset color to default, if not, comment will be blue colored
  47      props.put<property::FontColor>(IWORKColor(0,0,0,1));
  48 -    spans[unsigned(len)]=std::make_shared<IWORKStyle>(props, boost::none, nullptr);
  49 +    spans[unsigned(len)]=std::make_shared<IWORKStyle>(props, boost::none, IWORKStylePtr_t());
  50      text.setSpans(spans);
  51      text.parse(*m_currentText);
  52    }
  53 --
  54 2.31.1
  55