Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/third_party/poppler/cpp/poppler-global.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ typedef unsigned int /* time_t */ time_type;
#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::basic_string<char16_t>
{
public:
ustring();
Expand Down
3 changes: 2 additions & 1 deletion test/third_party/poppler/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ This is Poppler. See README and COPYING.

Changes for Emscripten:
Object.h, Array.cc, Dict.cc are modified to avoid uninitialization errors (search for 'Emscripten')

poppler-global.h is modified to use std::basic_string<char16_t> to compile with newer versions of
LLVM (this matches newer upstream versions of poppler)
Loading