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, 8 insertions, 8 deletions

diff --git a/cpp/client/src/IncomingMessage.cpp b/cpp/client/src/IncomingMessage.cpp
index c95a92b651..9576051302 100644
--- a/cpp/client/src/IncomingMessage.cpp
+++ b/cpp/client/src/IncomingMessage.cpp
@@ -29,12 +29,12 @@ IncomingMessage::IncomingMessage(BasicGetOkBody::shared_ptr intro): response(int
 IncomingMessage::~IncomingMessage(){
 }
 
-void IncomingMessage::setHeader(AMQHeaderBody::shared_ptr header){
-    this->header = header;
+void IncomingMessage::setHeader(AMQHeaderBody::shared_ptr _header){
+    this->header = _header;
 }
 
-void IncomingMessage::addContent(AMQContentBody::shared_ptr content){
-    this->content.push_back(content);
+void IncomingMessage::addContent(AMQContentBody::shared_ptr _content){
+    this->content.push_back(_content);
 }
 
 bool IncomingMessage::isComplete(){
@@ -75,10 +75,10 @@ void IncomingMessage::getData(string& s){
     }
 }
 
-long IncomingMessage::contentSize(){
-    long size(0);
-    int count(content.size());
-    for(int i = 0; i < count; i++){
+u_int64_t IncomingMessage::contentSize(){
+    u_int64_t size(0);
+    u_int64_t count(content.size());
+    for(u_int64_t i = 0; i < count; i++){
 	size += content[i]->size();
     }
     return size;