strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oox: change frozen::make_set to "conventional" frozen::set construction

Browse source 
Fixes compile issue with bisect repo started with commit: b839c09760 (https://gerrit.libreoffice.org/c/core/+/157003)

Log:

/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:622:2: error: no matching function for call to ‘make_set<std::u16string_view>(<brace-enclosed initializer list>)’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:223:16: note: candidate: template<class T> constexpr auto frozen::make_set(frozen::bits::ignored_arg)
 constexpr auto make_set(bits::ignored_arg = {}/* for consistency with the initializer below for N = 0*/) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:223:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:622:2: note:   cannot convert ‘{"b\000l\000o\000c\000k\000-\000a\000r\000c\000\000", "r\000e\000c\000t\000a\000n\000g\000l\000e\000\000", "e\000l\000l\000i\000p\000s\000e\000\000", "r\000i\000n\000g\000\000", "c\000a\000n\000\000", "c\000u\000b\000e\000\000", "p\000a\000p\000e\000r\000\000", "f\000r\000a\000m\000e\000\000", "f\000o\000r\000b\000i\000d\000d\000e\000n\000\000", "s\000m\000i\000l\000e\000y\000\000", "s\000u\000n\000\000", "f\000l\000o\000w\000e\000r\000\000", "b\000r\000a\000c\000k\000e\000t\000-\000p\000a\000i\000r\000\000", "b\000r\000a\000c\000e\000-\000p\000a\000i\000r\000\000", "q\000u\000a\000d\000-\000b\000e\000v\000e\000l\000\000", "r\000o\000u\000n\000d\000-\000r\000e\000c\000t\000a\000n\000g\000u\000l\000a\000r\000-\000c\000a\000l\000l\000o\000u\000t\000\000", "r\000e\000c\000t\000a\000n\000g\000u\000l\000a\000r\000-\000c\000a\000l\000l\000o\000u\000t\000\000", "r\000o\000u\000n\000d\000-\000c\000a\000l\000l\000o\000u\000t\000\000", "c\000l\000o\000u\000d\000-\000c\000a\000l\000l\000o\000u\000t\000\000", "l\000i\000n\000e\000-\000c\000a\000l\000l\000o\000u\000t\000-\0001\000\000", "l\000i\000n\000e\000-\000c\000a\000l\000l\000o\000u\000t\000-\0002\000\000", "l\000i\000n\000e\000-\000c\000a\000l\000l\000o\000u\000t\000-\0003\000\000", "p\000a\000p\000e\000r\000\000", "v\000e\000r\000t\000i\000c\000a\000l\000-\000s\000c\000r\000o\000l\000l\000\000", "h\000o\000r\000i\000z\000o\000n\000t\000a\000l\000-\000s\000c\000r\000o\000l\000l\000\000", "m\000s\000o\000-\000s\000p\000t\0003\0004\000\000", "m\000s\000o\000-\000s\000p\000t\0007\0005\000\000", "m\000s\000o\000-\000s\000p\000t\0001\0006\0004\000\000", "m\000s\000o\000-\000s\000p\000t\0001\0008\0000\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000p\000r\000o\000c\000e\000s\000s\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000a\000l\000t\000e\000r\000n\000a\000t\000e\000-\000p\000r\000o\000c\000e\000s\000s\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000d\000e\000c\000i\000s\000i\000o\000n\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000d\000a\000t\000a\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000p\000r\000e\000d\000e\000f\000i\000n\000e\000d\000-\000p\000r\000o\000c\000e\000s\000s\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000i\000n\000t\000e\000r\000n\000a\000l\000-\000s\000t\000o\000r\000a\000g\000e\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000d\000o\000c\000u\000m\000e\000n\000t\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000m\000u\000l\000t\000i\000d\000o\000c\000u\000m\000e\000n\000t\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000t\000e\000r\000m\000i\000n\000a\000t\000o\000r\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000p\000r\000e\000p\000a\000r\000a\000t\000i\000o\000n\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000m\000a\000n\000u\000a\000l\000-\000i\000n\000p\000u\000t\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000m\000a\000n\000u\000a\000l\000-\000o\000p\000e\000r\000a\000t\000i\000o\000n\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000c\000o\000n\000n\000e\000c\000t\000o\000r\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000o\000f\000f\000-\000p\000a\000g\000e\000-\000c\000o\000n\000n\000e\000c\000t\000o\000r\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000c\000a\000r\000d\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000p\000u\000n\000c\000h\000e\000d\000-\000t\000a\000p\000e\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000s\000u\000m\000m\000i\000n\000g\000-\000j\000u\000n\000c\000t\000i\000o\000n\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000o\000r\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000c\000o\000l\000l\000a\000t\000e\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000s\000o\000r\000t\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000e\000x\000t\000r\000a\000c\000t\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000m\000e\000r\000g\000e\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000s\000t\000o\000r\000e\000d\000-\000d\000a\000t\000a\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000d\000e\000l\000a\000y\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000s\000e\000q\000u\000e\000n\000t\000i\000a\000l\000-\000a\000c\000c\000e\000s\000s\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000m\000a\000g\000n\000e\000t\000i\000c\000-\000d\000i\000s\000k\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000d\000i\000r\000e\000c\000t\000-\000a\000c\000c\000e\000s\000s\000-\000s\000t\000o\000r\000a\000g\000e\000\000", "f\000l\000o\000w\000c\000h\000a\000r\000t\000-\000d\000i\000s\000p\000l\000a\000y\000\000"}’ (type ‘<brace-enclosed initializer list>’) to type ‘frozen::bits::ignored_arg’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:228:16: note: candidate: template<class T, long unsigned int N> constexpr auto frozen::make_set(const T (&)[N])
 constexpr auto make_set(const T (&args)[N]) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:228:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:622:2: note:   mismatched types ‘std::basic_string_view<char16_t>’ and ‘const char16_t*’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:233:16: note: candidate: template<class T, long unsigned int N> constexpr auto frozen::make_set(const std::array<_Tp, _Nm>&)
 constexpr auto make_set(std::array<T, N> const &args) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:233:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:622:2: note:   couldn't deduce template parameter ‘N’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:238:16: note: candidate: template<class T, class Compare, long unsigned int N> constexpr auto frozen::make_set(const T (&)[N], const Compare&)
 constexpr auto make_set(const T (&args)[N], Compare const& compare = Compare{}) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:238:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:622:2: note:   mismatched types ‘std::basic_string_view<char16_t>’ and ‘const char16_t*’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:243:16: note: candidate: template<class T, class Compare, long unsigned int N> constexpr auto frozen::make_set(const std::array<T, N>&, const Compare&)
 constexpr auto make_set(std::array<T, N> const &args, Compare const& compare = Compare{}) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:243:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:622:2: note:   couldn't deduce template parameter ‘Compare’
 });
  ^
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:630:2: error: no matching function for call to ‘make_set<std::u16string_view>(<brace-enclosed initializer list>)’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:223:16: note: candidate: template<class T> constexpr auto frozen::make_set(frozen::bits::ignored_arg)
 constexpr auto make_set(bits::ignored_arg = {}/* for consistency with the initializer below for N = 0*/) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:223:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:630:2: note:   cannot convert ‘{"h\000e\000a\000r\000t\000\000", "p\000u\000z\000z\000l\000e\000\000", "c\000o\000l\000-\0006\0000\000d\000a\0008\0004\0006\0000\000\000", "c\000o\000l\000-\0005\0000\0002\000a\000d\0004\0000\0000\000\000"}’ (type ‘<brace-enclosed initializer list>’) to type ‘frozen::bits::ignored_arg’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:228:16: note: candidate: template<class T, long unsigned int N> constexpr auto frozen::make_set(const T (&)[N])
 constexpr auto make_set(const T (&args)[N]) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:228:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:630:2: note:   mismatched types ‘std::basic_string_view<char16_t>’ and ‘const char16_t*’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:233:16: note: candidate: template<class T, long unsigned int N> constexpr auto frozen::make_set(const std::array<_Tp, _Nm>&)
 constexpr auto make_set(std::array<T, N> const &args) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:233:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:630:2: note:   couldn't deduce template parameter ‘N’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:238:16: note: candidate: template<class T, class Compare, long unsigned int N> constexpr auto frozen::make_set(const T (&)[N], const Compare&)
 constexpr auto make_set(const T (&args)[N], Compare const& compare = Compare{}) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:238:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:630:2: note:   mismatched types ‘std::basic_string_view<char16_t>’ and ‘const char16_t*’
 });
  ^
In file included from /home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:90:0:
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:243:16: note: candidate: template<class T, class Compare, long unsigned int N> constexpr auto frozen::make_set(const std::array<T, N>&, const Compare&)
 constexpr auto make_set(std::array<T, N> const &args, Compare const& compare = Compare{}) {
                ^~~~~~~~
/home/tdf/lode/bibisect/core242/workdir/UnpackedTarball/frozen/include/frozen/set.h:243:16: note:   template argument deduction/substitution failed:
/home/tdf/lode/bibisect/core242/oox/source/export/shapes.cxx:630:2: note:   couldn't deduce template parameter ‘Compare’
 });
  ^
make[1]: *** [/home/tdf/lode/bibisect/core242/solenv/gbuild/LinkTarget.mk:340: /home/tdf/lode/bibisect/core242/workdir/CxxObject/oox/source/export/shapes.o] Error 1

Change-Id: Ie2d4dbe05df89578e5f86c4d2ef8367a563e3942
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157024
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl 2023-09-18 14:51:59 +02:00 committed by Tomaž Vajngerl
parent 655874489a
commit 8a9c3e8238
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oox/source/export/shapes.cxx
View file

@ -560,7 +560,7 @@ ShapeExport& ShapeExport::WriteGroupShape(const uno::Reference<drawing::XShape>&
namespace
{
constexpr auto constDenySet = frozen::make_set<std::u16string_view>(
constexpr frozen::set<std::u16string_view, 57> constDenySet(
{
u"block-arc",
u"rectangle",
@ -621,7 +621,7 @@ constexpr auto constDenySet = frozen::make_set<std::u16string_view>(
u"flowchart-display"
});
constexpr auto constAllowSet = frozen::make_set<std::u16string_view>(
constexpr frozen::set<std::u16string_view, 4> constAllowSet(
{
u"heart",
u"puzzle",