[Libreoffice-commits] core.git: sal/osl

Michael Stahl mstahl at redhat.com
Wed Nov 19 15:09:28 PST 2014


 sal/osl/unx/signal.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d273a60bfdbf9bb7623bed38667ec0647753157c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 20 00:03:10 2014 +0100

    sal: fix --enable-crashdump build in new C++ world order
    
    Change-Id: I95e4f43f4ef40e8c04b37002bbae03f4f23a9e34

diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 890b73e..b5de273 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -599,11 +599,11 @@ static int ReportCrash( int Signal )
                         Dl_info dl_info;
 
                         fprintf( stackout, "0x%" SAL_PRIxUINTPTR ":",
-                            SAL_INT_CAST(sal_uIntPtr, stackframes[iFrame]) );
+                            reinterpret_cast<sal_uIntPtr>(stackframes[iFrame]) );
 
                         fprintf( xmlout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%" SAL_PRIxUINTPTR "\"",
                             iFrame,
-                            SAL_INT_CAST(sal_uIntPtr, stackframes[iFrame])
+                            reinterpret_cast<sal_uIntPtr>(stackframes[iFrame])
                             );
 
                         memset( &dl_info, 0, sizeof(dl_info) );
@@ -648,8 +648,8 @@ static int ReportCrash( int Signal )
                                     for ( j = 0; j < 16; fprintf( checksumout, "%02X", checksum[j++] ) );
                                     fprintf( checksumout,
                                         "\" bytes=\"%lu\" file=\"%s\"/>\n",
-                                        SAL_INT_CAST(
-                                            unsigned long, nBytesProcessed),
+                                        sal::static_int_cast<
+                                            unsigned long>(nBytesProcessed),
                                         dli_fname );
                                 }
                             }


More information about the Libreoffice-commits mailing list