diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-01-21 02:23:24 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-01-21 02:23:24 +0000 |
| commit | 0ac5d66f690a0f0293418f39c5078a93023e83c7 (patch) | |
| tree | 1a03061ae54863b876dd6940093009e32d0b17e3 /editors/plume-creator-devel/files/patch-externals_hunspell_affentry.hxx | |
| parent | security/veracrypt: unbreak build with wxWidgets 3.0.3 (diff) | |
editors/plume-creator-devel: unbreak build with Clang 6 (C++14 by default)
In file included from externals/hunspell/affixmgr.cxx:12:
externals/hunspell/affentry.hxx:30:94: error: cannot initialize a parameter of type 'unsigned short' with an rvalue of type 'nullptr_t'
struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL);
^ ~~~~
externals/hunspell/affentry.hxx:30:94: note: passing argument to parameter 'needflag' here
externals/hunspell/affentry.hxx:93:103: error: cannot initialize a parameter of type 'unsigned short' with an rvalue of type 'nullptr_t'
struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL);
^ ~~~~
Reported by: pkg-fallout
Obtained from: upstream (Hunspell 1.4.0)
Diffstat (limited to 'editors/plume-creator-devel/files/patch-externals_hunspell_affentry.hxx')
| -rw-r--r-- | editors/plume-creator-devel/files/patch-externals_hunspell_affentry.hxx | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/editors/plume-creator-devel/files/patch-externals_hunspell_affentry.hxx b/editors/plume-creator-devel/files/patch-externals_hunspell_affentry.hxx new file mode 100644 index 000000000000..d8ad1aa1d4d4 --- /dev/null +++ b/editors/plume-creator-devel/files/patch-externals_hunspell_affentry.hxx @@ -0,0 +1,27 @@ +https://github.com/hunspell/hunspell/commit/be3b8d945a25 +https://github.com/hunspell/hunspell/commit/dd3a71c38b61 + +--- externals/hunspell/affentry.hxx.orig 2015-05-10 16:46:22 UTC ++++ externals/hunspell/affentry.hxx +@@ -27,7 +27,7 @@ class LIBHUNSPELL_DLL_EXPORTED PfxEntry : protected Af + struct hentry * checkword(const char * word, int len, char in_compound, + const FLAG needflag = FLAG_NULL); + +- struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); ++ struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); + + char * check_morph(const char * word, int len, char in_compound, + const FLAG needflag = FLAG_NULL); +@@ -87,10 +87,9 @@ class LIBHUNSPELL_DLL_EXPORTED SfxEntry : protected Af + inline bool allowCross() { return ((opts & aeXPRODUCT) != 0); } + struct hentry * checkword(const char * word, int len, int optflags, + PfxEntry* ppfx, char ** wlst, int maxSug, int * ns, +-// const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); +- const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); ++ const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = FLAG_NULL); + +- struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); ++ struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); + + char * check_twosfx_morph(const char * word, int len, int optflags, + PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); |