summaryrefslogtreecommitdiff
path: root/salhelper
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-08-13 15:51:20 +0200
committerMichael Stahl <mstahl@redhat.com>2014-08-13 15:53:28 +0200
commit0201156f938af5bede5e3935048e81e88534ca10 (patch)
tree368c1c05ed0f2cf0a8041d40fac399b9bcc9b131 /salhelper
parenta247b8257a904372fcc2330bd8820176d4a71ebd (diff)
salhelper: work around spurious warning C4189
Change-Id: If919ca6da332bb94419a25253a5d6dec7243def9
Diffstat (limited to 'salhelper')
-rw-r--r--salhelper/qa/test_api.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index 5892b2c8338a..f016a88d55db 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 {