sal/inc/sal/log.hxx | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
New commits: commit 364a3d2864973935b2cd18b328392d1b556456dd Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Nov 23 20:26:52 2011 +0100 Silence bogus MSC "must return a value" errors. diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx index be71d02..cf22519 100644 --- a/sal/inc/sal/log.hxx +++ b/sal/inc/sal/log.hxx @@ -91,25 +91,39 @@ template< typename T > inline StreamIgnore operator <<( StreamStart const &, T const &) { std::abort(); +#if defined _MSC_VER + return StreamIgnore(); +#endif } template< typename T > inline StreamIgnore operator <<( StreamString const &, T const &) { std::abort(); +#if defined _MSC_VER + return StreamIgnore(); +#endif } template< typename T > inline StreamIgnore operator <<( StreamIgnore const &, T const &) { std::abort(); +#if defined _MSC_VER + return StreamIgnore(); +#endif } template< typename T > typename T::Result getResult(T const &); inline char const * unwrapStream(StreamString const & s) { return s.string; } -inline char const * unwrapStream(StreamIgnore const &) { std::abort(); } +inline char const * unwrapStream(StreamIgnore const &) { + std::abort(); +#if defined _MSC_VER + return 0; +#endif +} } } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits