diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 20:26:52 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 20:26:52 +0100 |
commit | 364a3d2864973935b2cd18b328392d1b556456dd (patch) | |
tree | fdd0e12eb4d0965b3e723d66540bca42403a9d87 /sal | |
parent | 5d7964a5c4f7fbb41df05042229d540feb32de8c (diff) |
Silence bogus MSC "must return a value" errors.
Diffstat (limited to 'sal')
-rw-r--r-- | sal/inc/sal/log.hxx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx index be71d021d560..cf22519b4423 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 +} } } |