include/sal/log.hxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) New commits: commit f168fcaed2b30178ca6bf5ddb0f8f1763e10a8db Author: Michael Stahl <mst...@redhat.com> Date: Tue Aug 4 11:44:55 2015 +0200
sal: partially revert a251fe4d48237a4d9c9530dafc7bbdce6028e9cf The change to sal/log.hxx affects extensions too which are not required to use a C++11 compiler. Change-Id: I3ed08f9a02a2e082fcdb821bce84244597f2390a diff --git a/include/sal/log.hxx b/include/sal/log.hxx index 62cdb77..563ed57 100644 --- a/include/sal/log.hxx +++ b/include/sal/log.hxx @@ -74,18 +74,27 @@ template< typename T > inline StreamIgnore operator <<( SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &) { std::abort(); +#if defined _MSC_VER && _MSC_VER < 1700 + return StreamIgnore(); +#endif } template< typename T > inline StreamIgnore operator <<( SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &) { std::abort(); +#if defined _MSC_VER && _MSC_VER < 1700 + return StreamIgnore(); +#endif } template< typename T > inline StreamIgnore operator <<( SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &) { std::abort(); +#if defined _MSC_VER && _MSC_VER < 1700 + return StreamIgnore(); +#endif } template< typename T > typename T::Result getResult(T const &); @@ -94,6 +103,9 @@ inline char const * unwrapStream(StreamString const & s) { return s.string; } inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { std::abort(); +#if defined _MSC_VER && _MSC_VER < 1700 + return 0; +#endif } } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits