diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-10-07 22:29:46 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-05-14 15:34:22 +0200 |
| commit | e1ce4ca6caac838dfea2a78da57f97fa1b9873f1 (patch) | |
| tree | 12881fb69a5cfd3ce958925534a2caaae56b2ac8 | |
| parent | bafde4784c4bcb4acea4010f79f4b74f5227ac02 (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.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104074
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit a9976a958b2857e308c6598532151878615bfd9f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114997
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit eaa9f84465eb330aa4c68711e8c8ec609503c5d3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115500
Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit aed21ef623820b36d4ced1fda5c20e2d0fa683a7)
Change-Id: If92cfb565ed9344b2ec1403793d7aeff8bd019ad
| -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 3ab387e734be..779ec8d4fba1 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ external/liborcus/rpath.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..9555dd534b3e --- /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; + |