configure.ac | 9 +++++++++ include/cppu/unotype.hxx | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-)
New commits: commit 427ef167e1a49ba7fcdef082de43622e02a84ce5 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Wed Apr 1 09:15:44 2015 +0200 configure: check for validators if --with-export-validation is used Change-Id: I535669e46f2535f0a0c0b106b964bfbc3a2e2d7e diff --git a/configure.ac b/configure.ac index f5c27f8..0dbf5ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2723,6 +2723,15 @@ AC_MSG_CHECKING([whether to enable export file validation]) if test "$with_export_validation" = yes; then AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_EXPORT_VALIDATION) + + AC_CHECK_PROGS(ODFVALIDATOR, odfvalidator) + if test -z "$ODFVALIDATOR"; then + AC_MSG_ERROR([odfvalidator is not found in PATH, but required by --with-export-validation]) + fi + AC_CHECK_PROGS(OFFICEOTRON, officeotron) + if test -z "$OFFICEOTRON"; then + AC_MSG_ERROR([officeotron is not found in PATH, but required by --with-export-validation]) + fi else AC_MSG_RESULT([no]) fi commit b49abbbd9d0107bef93adde32a1b51c78b6df469 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Apr 1 09:15:41 2015 +0200 MSVC 2013 doesn't define __cplusplus >= 201103L ...but does support std::remove_reference Change-Id: I4a702efdea9aad91cee32aca08da755e482e4b88 diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx index 7c4d377..4c7e5a7 100644 --- a/include/cppu/unotype.hxx +++ b/include/cppu/unotype.hxx @@ -22,7 +22,7 @@ #include <sal/config.h> -#if __cplusplus >= 201103L +#if defined LIBO_INTERNAL_ONLY #include <type_traits> #endif @@ -269,7 +269,7 @@ template< typename T > class UnoType { public: static inline ::com::sun::star::uno::Type const & get() { using namespace ::cppu::detail; -#if __cplusplus >= 201103L +#if defined LIBO_INTERNAL_ONLY typedef typename std::remove_reference<T>::type T1; // for certain uses of UnoType<decltype(x)> #else _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits