diff options
-rw-r--r-- | external/poppler/UnpackedTarball_poppler.mk | 1 | ||||
-rw-r--r-- | external/poppler/char_traits.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index 5726814fee82..62ed7a24ec1d 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/pch.patch.0 \ external/poppler/disable-freetype.patch.1 \ external/poppler/gcc7-EntityInfo.patch.1 \ + external/poppler/char_traits.patch \ )) ifneq ($(filter -fsanitize=%,$(CC)),) diff --git a/external/poppler/char_traits.patch b/external/poppler/char_traits.patch new file mode 100644 index 000000000000..3483f2fe22d8 --- /dev/null +++ b/external/poppler/char_traits.patch @@ -0,0 +1,11 @@ +--- cpp/poppler-global.h ++++ cpp/poppler-global.h +@@ -98,7 +98,7 @@ + # pragma warning(push) + # pragma warning(disable : 4251) /* class 'A' needs to have dll interface for to be used by clients of class 'B'. */ + #endif +-class POPPLER_CPP_EXPORT ustring : public std::basic_string<unsigned short> ++class POPPLER_CPP_EXPORT ustring : public std::u16string + { + public: + ustring(); |