[Libreoffice-commits] .: sal/workben

Caolán McNamara caolan at kemper.freedesktop.org
Mon Nov 21 02:40:49 PST 2011


 sal/workben/measure_oustrings.cxx |    2 +-
 sal/workben/testproc.cxx          |   12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 2c46cde2edf25e8c9ae6f591b52a6b7c086fe166
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 21 10:40:42 2011 +0000

    poke __cplusplus into workben comparison tool

diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx
index f9ce02b..eff82c8 100644
--- a/sal/workben/measure_oustrings.cxx
+++ b/sal/workben/measure_oustrings.cxx
@@ -45,7 +45,7 @@ int COUNT = 1;
 int COUNT = 10000000;
 #endif
 
-#if defined __GXX_EXPERIMENTAL_CXX0X__
+#if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
 #   define HAVE_CXX_Ox 1
 #endif
 
diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx
index ed515ef..c015d08 100644
--- a/sal/workben/testproc.cxx
+++ b/sal/workben/testproc.cxx
@@ -43,7 +43,6 @@
 int MAIN (void)
 {
     //oslProcess Process;
-    oslProcessError  ProcessError;
     sal_uInt32 nArgCount;
     sal_uInt32 index;
     rtl_uString* ustrExeFile=0;
@@ -62,17 +61,8 @@ int MAIN (void)
         fprintf(stderr,"done ...\n\n");
     }
 
-    ProcessError = osl_getExecutableFile(&ustrExeFile);
+    osl_getExecutableFile(&ustrExeFile);
 
-/*
-    osl_executeProcess( "e:\\test\\os2de202.exe",
-                        NULL,
-                        osl_Process_NORMAL,
-                        0L,
-                        NULL,
-                        NULL,
-                        NULL,
-                        &Process );*/
     return 0;
 }
 


More information about the Libreoffice-commits mailing list