From cb6fd3afb3cb894f506989e3fe013d1adff54f5a Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 7 Oct 2014 13:18:08 -0700 Subject: g++ compiler warning fix --- testnet/TestEthernetTap.cpp | 3 ++- testnet/TestEthernetTap.hpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'testnet') diff --git a/testnet/TestEthernetTap.cpp b/testnet/TestEthernetTap.cpp index f3273d00..35c7511b 100644 --- a/testnet/TestEthernetTap.cpp +++ b/testnet/TestEthernetTap.cpp @@ -78,9 +78,10 @@ TestEthernetTap::TestEthernetTap( TestEthernetTap::~TestEthernetTap() { + static const TestFrame zf; { Mutex::Lock _l(_pq_m); - _pq.push(TestFrame()); // 0 length frame = exit + _pq.push(zf); // 0 length frame = exit } _pq_c.signal(); Thread::join(_thread); diff --git a/testnet/TestEthernetTap.hpp b/testnet/TestEthernetTap.hpp index 8b7a5e87..66e21922 100644 --- a/testnet/TestEthernetTap.hpp +++ b/testnet/TestEthernetTap.hpp @@ -63,7 +63,7 @@ class TestEthernetTap : public EthernetTap private: struct TestFrame { - TestFrame() : etherType(0),len(0) {} + TestFrame() : from(),to(),etherType(0),len(0) {} TestFrame(const MAC &f,const MAC &t,const void *d,unsigned int et,unsigned int l) : from(f), to(t), -- cgit v1.2.3