summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/tests/DispatcherTest.cpp4
-rw-r--r--cpp/src/tests/Makefile.am1
2 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/tests/DispatcherTest.cpp b/cpp/src/tests/DispatcherTest.cpp
index 8fdc3b9aea..6177e7bd11 100644
--- a/cpp/src/tests/DispatcherTest.cpp
+++ b/cpp/src/tests/DispatcherTest.cpp
@@ -170,10 +170,10 @@ int main(int /*argc*/, char** /*argv*/)
rc = ::sigaction(SIGRTMIN, &sa,0);
assert(rc == 0);
- ::sigevent se={};
+ ::sigevent se;
+ ::memset(&se, 0, sizeof(se)); // Clear to make valgrind happy (this *is* the neatest way to do this portably - sigh)
se.sigev_notify = SIGEV_SIGNAL;
se.sigev_signo = SIGRTMIN;
- se.sigev_value.sival_ptr = 0;
rc = ::timer_create(CLOCK_REALTIME, &se, &timer);
assert(rc == 0);
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index e599b95edd..6b7b6df478 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -201,7 +201,6 @@ PollerTest_LDADD=$(lib_common)
check_PROGRAMS+=DispatcherTest
DispatcherTest_SOURCES=DispatcherTest.cpp
DispatcherTest_LDADD=$(lib_common)
-DispatcherTest_CXXFLAGS=$(AM_CXXFLAGS) -Wno-missing-field-initializers
TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) QPID_DATA_DIR= BOOST_TEST_SHOW_PROGRESS=yes $(srcdir)/run_test