summaryrefslogtreecommitdiff
path: root/include/sal
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-03-19 10:57:17 +0200
committerTor Lillqvist <tml@collabora.com>2015-03-19 10:57:17 +0200
commita251fe4d48237a4d9c9530dafc7bbdce6028e9cf (patch)
treea869b336f221df414c35bdf6ce3167a29ab279f1 /include/sal
parentcfeeceab9ea03b5507cdb7ddb90fcc1b8b1a4e85 (diff)
We require MSVC2013 (_MSC_VER == 1800) now
Change-Id: Ice8504041f22e00f2e5010813d9dff1d2987c8d6
Diffstat (limited to 'include/sal')
-rw-r--r--include/sal/log.hxx12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 563ed57a2c6d..62cdb77aab1b 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -74,27 +74,18 @@ template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
- return StreamIgnore();
-#endif
}
template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
- return StreamIgnore();
-#endif
}
template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &)
{
std::abort();
-#if defined _MSC_VER && _MSC_VER < 1700
- return StreamIgnore();
-#endif
}
template< typename T > typename T::Result getResult(T const &);
@@ -103,9 +94,6 @@ 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 && _MSC_VER < 1700
- return 0;
-#endif
}
} }