mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal: partially revert a251fe4d48

Browse Source 
The change to sal/log.hxx affects extensions too which are not required
to use a C++11 compiler.

Change-Id: I3ed08f9a02a2e082fcdb821bce84244597f2390a
This commit is contained in:
Michael Stahl
2015-08-04 11:44:55 +02:00
parent 28e465d261
commit f168fcaed2
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/sal/log.hxx
View File

@@ -74,18 +74,27 @@ template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &) SAL_UNUSED_PARAMETER StreamStart const &, SAL_UNUSED_PARAMETER T const &)
{ {
std::abort(); std::abort();
#if defined _MSC_VER && _MSC_VER < 1700
return StreamIgnore();
#endif
} }
template< typename T > inline StreamIgnore operator <<( template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &) SAL_UNUSED_PARAMETER StreamString const &, SAL_UNUSED_PARAMETER T const &)
{ {
std::abort(); std::abort();
#if defined _MSC_VER && _MSC_VER < 1700
return StreamIgnore();
#endif
} }
template< typename T > inline StreamIgnore operator <<( template< typename T > inline StreamIgnore operator <<(
SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &) SAL_UNUSED_PARAMETER StreamIgnore const &, SAL_UNUSED_PARAMETER T const &)
{ {
std::abort(); std::abort();
#if defined _MSC_VER && _MSC_VER < 1700
return StreamIgnore();
#endif
} }
template< typename T > typename T::Result getResult(T const &); template< typename T > typename T::Result getResult(T const &);
@@ -94,6 +103,9 @@ inline char const * unwrapStream(StreamString const & s) { return s.string; }
inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
std::abort(); std::abort();
#if defined _MSC_VER && _MSC_VER < 1700
return 0;
#endif
} }
} } } }