Turned up gcc warnings, fixed warnings in code, enabled -Werror.

Note: #include "qpid_test_plugin.h" instead of <cppunit/TestPlugin.h> 
Works around warning from a cppunit macro.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@462834 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 12 deletions

diff --git a/cpp/broker/test/RouterTest.cpp b/cpp/broker/test/RouterTest.cpp
index 284a28f583..b1d4b9739f 100644
--- a/cpp/broker/test/RouterTest.cpp
+++ b/cpp/broker/test/RouterTest.cpp
@@ -20,10 +20,7 @@
 #include "ExchangeRegistry.h"
 #include "Message.h"
 #include "Router.h"
-#include <cppunit/TestCase.h>
-#include <cppunit/TextTestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
 
@@ -38,16 +35,14 @@ struct TestExchange : public Exchange{
 
     TestExchange() : Exchange("test"), args(0) {}
     
-    void bind(Queue::shared_ptr queue, const string& routingKey, FieldTable* args){
-    }
+    void bind(Queue::shared_ptr /*queue*/, const string& /*routingKey*/, FieldTable* /*args*/){}
 
-    void unbind(Queue::shared_ptr queue, const string& routingKey, FieldTable* args){
-    }
+    void unbind(Queue::shared_ptr /*queue*/, const string& /*routingKey*/, FieldTable* /*args*/){ }
 
-    void route(Message::shared_ptr& msg, const string& routingKey, FieldTable* args){
-        this->msg = msg;
-        this->routingKey = routingKey;
-        this->args = args;
+    void route(Message::shared_ptr& _msg, const string& _routingKey, FieldTable* _args){
+        msg = _msg;
+        routingKey = _routingKey;
+        args = _args;
     }
 };