diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-03 15:14:44 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-03 15:26:14 +0200 |
| commit | 9715794fcd076bc07eb6435a27b1d71f7e2b5e07 (patch) | |
| tree | e5f71d61335b318937c590a75ae271865b0f8c9d /sal | |
| parent | 6a9ee33ac962539d5533fd8392a97a7ccdd4e278 (diff) | |
VS2012 knows that std::abort() does what it says on the tin (WaE: unreachable code)
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/sal/log.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx index 2da147971d4c..bd8d47673698 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 } |