desktop/source/lib/init.cxx | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit 9a0e3d1de75a1986d614a52f1f41276411709cce Author: Julien Nabet <[email protected]> Date: Sun Oct 16 14:58:10 2016 +0200 fix Android build (desktop) stol is missing in the std namespace on the broken Android toolchain, work it around. (I copycat https://cgit.freedesktop.org/libreoffice/core/commit/?id=c2673a358c78b864c1276f7956d5a348003b7a02) Change-Id: I4d85b81abf5d72c08d9aae72638823b8a0484cc1 Reviewed-on: https://gerrit.libreoffice.org/29921 Tested-by: Jenkins <[email protected]> Reviewed-by: Julien Nabet <[email protected]> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 4e213bf..a7a6ea9 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -109,6 +109,12 @@ std::string to_string(T x) stream << x; return stream.str(); } + +long stol( const std::string& str, std::size_t* /*pos*/ = 0, int base = 10 ); +{ + char* end; + return strtol(str.c_str(), &end, base); +} } #endif _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
