diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-10-07 22:29:46 +0200 |
|---|---|---|
| committer | Muhammet Kara <muhammet.kara@collabora.com> | 2021-04-04 00:03:26 +0200 |
| commit | 27cef89f5bc0a11e362925410c108cf6ff1d6f18 (patch) | |
| tree | 858d52f759862dbf104ef48b26b886f2a0a05519 /external | |
| parent | a23f7871e5d0a8caa2b886615f40ea17b4620105 (diff) | |
external/liborcus: Missing includes
...as seen with recent GCC 11 trunk libstdc++:
> orcus_xlsx.cpp: In function ‘size_t orcus::{anonymous}::get_schema_rank(orcus::schema_t)’:
> orcus_xlsx.cpp:313:59: error: incomplete type ‘std::numeric_limits<long unsigned int>’ used in nested name specifier
> 313 | return it == rank_map.end() ? numeric_limits<size_t>::max() : it->second;
> | ^~~
etc.
Change-Id: If92cfb565ed9344b2ec1403793d7aeff8bd019ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104074
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113557
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 1 | ||||
| -rw-r--r-- | external/liborcus/include.patch.0 | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index e5e33b0b1249..113e8e25818d 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/gcc9.patch.0 \ external/liborcus/libtool.patch.0 \ external/liborcus/fix-pch.patch.0 \ + external/liborcus/include.patch.0 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/include.patch.0 b/external/liborcus/include.patch.0 new file mode 100644 index 000000000000..7f876463a988 --- /dev/null +++ b/external/liborcus/include.patch.0 @@ -0,0 +1,30 @@ +--- src/liborcus/orcus_xlsx.cpp ++++ src/liborcus/orcus_xlsx.cpp +@@ -32,6 +32,7 @@ + + #include <cstdlib> + #include <iostream> ++#include <limits> + #include <string> + #include <cstring> + #include <sstream> +--- src/liborcus/xls_xml_context.cpp ++++ src/liborcus/xls_xml_context.cpp +@@ -16,6 +16,7 @@ + #include <mdds/sorted_string_map.hpp> + + #include <iostream> ++#include <limits> + + using namespace std; + +--- src/liborcus/xlsx_revision_context.cpp ++++ src/liborcus/xlsx_revision_context.cpp +@@ -16,6 +16,7 @@ + #include "orcus/global.hpp" + + #include <iostream> ++#include <limits> + + using namespace std; + |