[Libreoffice-commits] .: 2 commits - sal/inc sal/osl

Caolán McNamara caolan at kemper.freedesktop.org
Sun Mar 6 12:47:12 PST 2011


 sal/inc/rtl/allocator.hxx |    1 +
 sal/osl/w32/MAKEFILE.MK   |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit d43f55540c2086942205b96d7448395ce1371be7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Mar 6 20:39:05 2011 +0000

    WaE: silence this annoying warning

diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index a9040f4..ffad205 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -148,6 +148,7 @@ public:
     void destroy (pointer p)
     {
         p->~T();
+        (void)p; //MSVC2005 annoyingly warns this is unused
     }
 };
 
commit 94b3aa198071d216bf34e83b63b29aff35e7aefc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Mar 6 20:35:41 2011 +0000

    build these cxx files with exceptions enabled

diff --git a/sal/osl/w32/MAKEFILE.MK b/sal/osl/w32/MAKEFILE.MK
index 9dd1d0c..08e8745 100644
--- a/sal/osl/w32/MAKEFILE.MK
+++ b/sal/osl/w32/MAKEFILE.MK
@@ -29,6 +29,7 @@ PRJ=..$/..
 
 PRJNAME=sal
 TARGET=cpposl
+ENABLE_EXCEPTIONS=TRUE
 USE_LDUMP2=TRUE
 
 PROJECTPCH4DLL=TRUE


More information about the Libreoffice-commits mailing list