sal/inc/sal/log.hxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9715794fcd076bc07eb6435a27b1d71f7e2b5e07
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Mon Dec 3 15:14:44 2012 +0200
VS2012 knows that std::abort() does what it says on the tin (WaE:
unreachable code)
diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx
index 2da1479..bd8d476 100644
--- a/sal/inc/sal/log.hxx
+++ b/sal/inc/sal/log.hxx
@@ -94,7 +94,7 @@ template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
-#if defined _MSC_VER
+#if defined _MSC_VER && _MSC_VER < 1700
return StreamIgnore();
#endif
}
@@ -103,7 +103,7 @@ template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
-#if defined _MSC_VER
+#if defined _MSC_VER && _MSC_VER < 1700
return StreamIgnore();
#endif
}
@@ -112,7 +112,7 @@ template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
-#if defined _MSC_VER
+#if defined _MSC_VER && _MSC_VER < 1700
return StreamIgnore();
#endif
}
@@ -123,7 +123,7 @@ 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
+#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
