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

9 files changed, 16 insertions, 44 deletions

diff --git a/cpp/broker/test/ChannelTest.cpp b/cpp/broker/test/ChannelTest.cpp
index c96d17379e..45498989f2 100644
--- a/cpp/broker/test/ChannelTest.cpp
+++ b/cpp/broker/test/ChannelTest.cpp
@@ -17,10 +17,7 @@
  */
 #include "Channel.h"
 #include "Message.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>
 
diff --git a/cpp/broker/test/HeadersExchangeTest.cpp b/cpp/broker/test/HeadersExchangeTest.cpp
index 82d3a292a8..d56e00543d 100644
--- a/cpp/broker/test/HeadersExchangeTest.cpp
+++ b/cpp/broker/test/HeadersExchangeTest.cpp
@@ -19,10 +19,7 @@
 #include "HeadersExchange.h"
 #include "FieldTable.h"
 #include "Value.h"
-#include <cppunit/TestCase.h>
-#include <cppunit/TextTestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/cpp/broker/test/QueueRegistryTest.cpp b/cpp/broker/test/QueueRegistryTest.cpp
index c4ad40b5cd..bd739aaad5 100644
--- a/cpp/broker/test/QueueRegistryTest.cpp
+++ b/cpp/broker/test/QueueRegistryTest.cpp
@@ -1,8 +1,5 @@
 #include "QueueRegistry.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 <string>
 
 using namespace qpid::broker;
diff --git a/cpp/broker/test/QueueTest.cpp b/cpp/broker/test/QueueTest.cpp
index 973b1b5cf6..1b4eb814cb 100644
--- a/cpp/broker/test/QueueTest.cpp
+++ b/cpp/broker/test/QueueTest.cpp
@@ -17,10 +17,7 @@
  */
 #include "Queue.h"
 #include "QueueRegistry.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>
 
 using namespace qpid::broker;
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;
     }
 };
 
diff --git a/cpp/broker/test/TopicExchangeTest.cpp b/cpp/broker/test/TopicExchangeTest.cpp
index 4653540040..d9b49fc603 100644
--- a/cpp/broker/test/TopicExchangeTest.cpp
+++ b/cpp/broker/test/TopicExchangeTest.cpp
@@ -1,8 +1,5 @@
 #include "TopicExchange.h"
-#include <cppunit/TestCase.h>
-#include <cppunit/TextTestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
 
@@ -30,6 +27,7 @@ CppUnit::OStringStream& operator <<(CppUnit::OStringStream& out, const Tokens& v
     {
         out << '"' << *i << '"' << (i+1 == v.end() ? "]" : ", ");
     }
+    return out;
 }
 
 
diff --git a/cpp/broker/test/ValueTest.cpp b/cpp/broker/test/ValueTest.cpp
index 181f0ced84..ec9659e603 100644
--- a/cpp/broker/test/ValueTest.cpp
+++ b/cpp/broker/test/ValueTest.cpp
@@ -1,8 +1,5 @@
 #include "Value.h"
-#include <cppunit/TestCase.h>
-#include <cppunit/TextTestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
 
diff --git a/cpp/broker/test/exchange_test.cpp b/cpp/broker/test/exchange_test.cpp
index 6605f2685b..8c702ff836 100644
--- a/cpp/broker/test/exchange_test.cpp
+++ b/cpp/broker/test/exchange_test.cpp
@@ -20,10 +20,7 @@
 #include "Exchange.h"
 #include "Queue.h"
 #include "TopicExchange.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>
 
 using namespace qpid::broker;
diff --git a/cpp/broker/test/message_test.cpp b/cpp/broker/test/message_test.cpp
index 94d25a831e..fc2c6e01bb 100644
--- a/cpp/broker/test/message_test.cpp
+++ b/cpp/broker/test/message_test.cpp
@@ -17,10 +17,7 @@
  */
 #include "APRBase.h"
 #include "Message.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>
 
 using namespace qpid::broker;