From 364a3d2864973935b2cd18b328392d1b556456dd Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 23 Nov 2011 20:26:52 +0100
Subject: Silence bogus MSC "must return a value" errors.

---
 sal/inc/sal/log.hxx | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'sal')

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
+}
 
 } }
 
-- 
cgit