From 0fc676e57688d6dc878ed7080101258b413f8e59 Mon Sep 17 00:00:00 2001
From: Kyle Schwarz <kschwarz@intrepidcs.com>
Date: Thu, 20 Oct 2022 19:38:34 -0400
Subject: [PATCH] A2B: Resolve warnings

---
 .../icsneo/communication/message/callback/messagecallback.h | 2 ++
 .../message/callback/streamoutput/a2bwavoutput.h            | 6 +++---
 .../message/callback/streamoutput/streamoutput.h            | 6 ++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/icsneo/communication/message/callback/messagecallback.h b/include/icsneo/communication/message/callback/messagecallback.h
index e49f3e0..4682978 100644
--- a/include/icsneo/communication/message/callback/messagecallback.h
+++ b/include/icsneo/communication/message/callback/messagecallback.h
@@ -28,6 +28,8 @@ public:
 		: MessageCallback(cb, f) {}
 	MessageCallback(MessageFilter f, fn_messageCallback cb)
 		: MessageCallback(cb, std::make_shared<MessageFilter>(f)) {}
+
+	virtual ~MessageCallback() = default;
 	
 	virtual bool callIfMatch(const std::shared_ptr<Message>& message) const {
 		bool ret = filter->match(message);
diff --git a/include/icsneo/communication/message/callback/streamoutput/a2bwavoutput.h b/include/icsneo/communication/message/callback/streamoutput/a2bwavoutput.h
index e7820c5..c078570 100644
--- a/include/icsneo/communication/message/callback/streamoutput/a2bwavoutput.h
+++ b/include/icsneo/communication/message/callback/streamoutput/a2bwavoutput.h
@@ -13,10 +13,10 @@ namespace icsneo {
 class A2BWAVOutput : public StreamOutput {
 public:
 	A2BWAVOutput(const char* filename, uint32_t sampleRate = A2BPCM_SAMPLERATE_44100) 
-		: wavSampleRate(sampleRate), StreamOutput(filename) {}
+		: StreamOutput(filename), wavSampleRate(sampleRate) {}
 
 	A2BWAVOutput(std::unique_ptr<std::ostream>&& os, uint32_t sampleRate = A2BPCM_SAMPLERATE_44100) 
-		: wavSampleRate(sampleRate), StreamOutput(std::move(os)) {}
+		: StreamOutput(std::move(os)), wavSampleRate(sampleRate) {}
 
 	void writeHeader(const std::shared_ptr<A2BMessage>& firstMsg) const;
 
@@ -24,7 +24,7 @@ public:
 
 	void close() const;
 
-	~A2BWAVOutput() {
+	~A2BWAVOutput() override {
 		if(!closed) {
 			close();
 		}
diff --git a/include/icsneo/communication/message/callback/streamoutput/streamoutput.h b/include/icsneo/communication/message/callback/streamoutput/streamoutput.h
index 751f323..1e161c9 100644
--- a/include/icsneo/communication/message/callback/streamoutput/streamoutput.h
+++ b/include/icsneo/communication/message/callback/streamoutput/streamoutput.h
@@ -82,7 +82,7 @@ struct WaveFileHeader {
 class StreamOutput : public MessageCallback {
 public:
 	StreamOutput(std::unique_ptr<std::ostream>&& os, fn_messageCallback cb, std::shared_ptr<MessageFilter> f)
-		: stream(std::move(os)), MessageCallback(cb, f) {}
+		: MessageCallback(cb, f), stream(std::move(os)) {}
 
 	StreamOutput(const char* filename, fn_messageCallback cb, std::shared_ptr<MessageFilter> f)
 		: MessageCallback(cb, f) {
@@ -93,9 +93,7 @@ public:
 		stream = std::make_unique<std::ofstream>(filename, std::ios::binary);
 	}
 
-	StreamOutput(std::unique_ptr<std::ostream>&& os) : stream(std::move(os)), MessageCallback([](std::shared_ptr<Message> msg) {}) {}
-
-	virtual ~StreamOutput() {}
+	StreamOutput(std::unique_ptr<std::ostream>&& os) : MessageCallback([](std::shared_ptr<Message> msg) {}), stream(std::move(os)) {}
 
 protected:
 	std::unique_ptr<std::ostream> stream;