head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2014.02.02.07.43.40;	author ryoon;	state dead;
branches;
next	1.1;
commitid	SCRPn9tBPxRmXunx;

1.1
date	2014.01.20.19.27.51;	author joerg;	state Exp;
branches;
next	;
commitid	mZR31TNIY8KOgTlx;


desc
@@


1.2
log
@Update to 4.2.0.4

Changelog:
* Many bugfixes
* Many new features
See https://wiki.documentfoundation.org/ReleaseNotes/4.2
and https://www.libreoffice.org/download/4-2-new-features-and-fixes/
@
text
@$NetBSD: patch-include_sal_log.hxx,v 1.1 2014/01/20 19:27:51 joerg Exp $

--- include/sal/log.hxx.orig	2013-10-22 17:49:23.000000000 +0000
+++ include/sal/log.hxx
@@@@ -157,9 +157,13 @@@@ inline char const * unwrapStream(SAL_UNU
 
     @@since LibreOffice 3.5
 */
+#ifdef _LIBCPP_VERSION
 #define SAL_STREAM(stream) \
-    (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream). \
-     str())
+    (::std::ostringstream() << stream).str()
+#else
+#define SAL_STREAM(stream) \
+    (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream).str())
+#endif
 
 /**
     @@page sal_log Basic logging functionality.
@


1.1
log
@Fix build with Clang. Patches mostly from FreeBSD.
@
text
@d1 1
a1 1
$NetBSD$
@