[Libreoffice-commits] core.git: salhelper/qa

[Michael Stahl]

 salhelper/qa/test_api.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 0201156f938af5bede5e3935048e81e88534ca10
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 13 15:51:20 2014 +0200

    salhelper: work around spurious warning C4189
    
    Change-Id: If919ca6da332bb94419a25253a5d6dec7243def9

diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index 5892b2c..f016a88 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -120,6 +120,13 @@ void Test::testCondition() {
     CPPUNIT_ASSERT(typeid (salhelper::Condition *) == getConditionTypeInfo());
 }
 
+#ifdef _MSC_VER
+// MSVC 2012 warns about the "p" being unused
+#pragma warning (push, 1)
+#pragma warning (disable: 4189)
+#endif
+
+
 void Test::testConditionModifier() {
     salhelper::ConditionModifier * p = 0;
     CPPUNIT_ASSERT(typeid (*p) == typeid (salhelper::ConditionModifier));
@@ -184,6 +191,10 @@ void Test::testORealDynamicLoader() {
         == getORealDynamicLoaderTypeInfo());
 }
 
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
 void Test::testSimpleReferenceObject() {
     salhelper::SimpleReferenceObject * p = new DerivedSimpleReferenceObject;
     try {