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, 29 insertions, 25 deletions

diff --git a/cpp/common/framing/inc/AMQHeaderBody.h b/cpp/common/framing/inc/AMQHeaderBody.h
index e39fffa8ce..4f9cdb571a 100644
--- a/cpp/common/framing/inc/AMQHeaderBody.h
+++ b/cpp/common/framing/inc/AMQHeaderBody.h
@@ -42,7 +42,7 @@ public:
     HeaderProperties* getProperties(){ return properties; }
     const HeaderProperties* getProperties() const { return properties; }
     inline u_int64_t getContentSize() const { return contentSize; }
-    inline void setContentSize(u_int64_t size) { contentSize = size; }
+    inline void setContentSize(u_int64_t _size) { contentSize = _size; }
     virtual ~AMQHeaderBody();
     virtual u_int32_t size() const;
     virtual void encode(Buffer& buffer) const;
diff --git a/cpp/common/framing/inc/AMQHeartbeatBody.h b/cpp/common/framing/inc/AMQHeartbeatBody.h
index cfe057bdcd..da612a2a44 100644
--- a/cpp/common/framing/inc/AMQHeartbeatBody.h
+++ b/cpp/common/framing/inc/AMQHeartbeatBody.h
@@ -33,8 +33,8 @@ public:
     virtual ~AMQHeartbeatBody();
     inline u_int32_t size() const { return 0; }
     inline u_int8_t type() const { return HEARTBEAT_BODY; }
-    inline void encode(Buffer& buffer) const {}
-    inline void decode(Buffer& buffer, u_int32_t size) {}
+    inline void encode(Buffer& ) const {}
+    inline void decode(Buffer& , u_int32_t /*size*/) {}
     virtual void print(std::ostream& out) const;
 };
 
diff --git a/cpp/common/framing/inc/BasicHeaderProperties.h b/cpp/common/framing/inc/BasicHeaderProperties.h
index 8688a37bf9..c32612221b 100644
--- a/cpp/common/framing/inc/BasicHeaderProperties.h
+++ b/cpp/common/framing/inc/BasicHeaderProperties.h
@@ -70,20 +70,20 @@ namespace framing {
 	inline string& getAppId(){ return appId; }
 	inline string& getClusterId(){ return clusterId; }
 
-	void inline setContentType(string& type){ contentType = type; }
+	void inline setContentType(string& _type){ contentType = _type; }
 	void inline setContentEncoding(string& encoding){ contentEncoding = encoding; }
-	void inline setHeaders(FieldTable& headers){ this->headers = headers; }
+	void inline setHeaders(FieldTable& _headers){ headers = _headers; }
 	void inline setDeliveryMode(u_int8_t mode){ deliveryMode = mode; }
-	void inline setPriority(u_int8_t priority){ this->priority = priority; }
-	void inline setCorrelationId(string& correlationId){ this->correlationId = correlationId; }
-	void inline setReplyTo(string& replyTo){ this->replyTo = replyTo;}
-	void inline setExpiration(string&  expiration){ this->expiration = expiration; }
-	void inline setMessageId(string& messageId){ this->messageId = messageId; }
-	void inline setTimestamp(u_int64_t timestamp){ this->timestamp = timestamp; }
-	void inline setType(string& type){ this->type = type; }
-	void inline setUserId(string& userId){ this->userId = userId; }
-	void inline setAppId(string& appId){this->appId = appId; }
-	void inline setClusterId(string& clusterId){ this->clusterId = clusterId; }
+	void inline setPriority(u_int8_t _priority){ priority = _priority; }
+	void inline setCorrelationId(string& _correlationId){ correlationId = _correlationId; }
+	void inline setReplyTo(string& _replyTo){ replyTo = _replyTo;}
+	void inline setExpiration(string&  _expiration){ expiration = _expiration; }
+	void inline setMessageId(string& _messageId){ messageId = _messageId; }
+	void inline setTimestamp(u_int64_t _timestamp){ timestamp = _timestamp; }
+	void inline setType(string& _type){ type = _type; }
+	void inline setUserId(string& _userId){ userId = _userId; }
+	void inline setAppId(string& _appId){appId = _appId; }
+	void inline setClusterId(string& _clusterId){ clusterId = _clusterId; }
     };
 
 }
diff --git a/cpp/common/framing/inc/BodyHandler.h b/cpp/common/framing/inc/BodyHandler.h
index f92ae66804..a4aee2709e 100644
--- a/cpp/common/framing/inc/BodyHandler.h
+++ b/cpp/common/framing/inc/BodyHandler.h
@@ -30,6 +30,7 @@ namespace framing {
 
     class BodyHandler{
     public:
+        virtual ~BodyHandler();
 	virtual void handleMethod(AMQMethodBody::shared_ptr body) = 0;
 	virtual void handleHeader(AMQHeaderBody::shared_ptr body) = 0;
 	virtual void handleContent(AMQContentBody::shared_ptr body) = 0;
diff --git a/cpp/common/framing/inc/Buffer.h b/cpp/common/framing/inc/Buffer.h
index e0532cc9d6..4d3d503b00 100644
--- a/cpp/common/framing/inc/Buffer.h
+++ b/cpp/common/framing/inc/Buffer.h
@@ -27,16 +27,16 @@ class FieldTable;
 
 class Buffer
 {
-    const int size;
+    const u_int32_t size;
     char* data;
-    int position;
-    int limit;
-    int r_position;
-    int r_limit;
+    u_int32_t position;
+    u_int32_t limit;
+    u_int32_t r_position;
+    u_int32_t r_limit;
 
 public:
 
-    Buffer(int size);
+    Buffer(u_int32_t size);
     ~Buffer();
 
     void flip();
@@ -44,9 +44,9 @@ public:
     void compact();
     void record();
     void restore();
-    int available();
+    u_int32_t available();
     char* start();
-    void move(int bytes);
+    void move(u_int32_t bytes);
     
     void putOctet(u_int8_t i);
     void putShort(u_int16_t i);
diff --git a/cpp/common/framing/inc/InitiationHandler.h b/cpp/common/framing/inc/InitiationHandler.h
index 2e8d1e652b..7b1fb36e2d 100644
--- a/cpp/common/framing/inc/InitiationHandler.h
+++ b/cpp/common/framing/inc/InitiationHandler.h
@@ -27,6 +27,7 @@ namespace framing {
 
     class InitiationHandler{
     public:
+        virtual ~InitiationHandler();
 	virtual void initiated(ProtocolInitiation* header) = 0;
     };
 
diff --git a/cpp/common/framing/inc/InputHandler.h b/cpp/common/framing/inc/InputHandler.h
index 2722cae0ed..927bd97ab4 100644
--- a/cpp/common/framing/inc/InputHandler.h
+++ b/cpp/common/framing/inc/InputHandler.h
@@ -27,6 +27,7 @@ namespace framing {
 
     class InputHandler{
     public:
+        virtual ~InputHandler();
 	virtual void received(AMQFrame* frame) = 0;
     };
 
diff --git a/cpp/common/framing/inc/OutputHandler.h b/cpp/common/framing/inc/OutputHandler.h
index 7fe63660c3..afc8d7f257 100644
--- a/cpp/common/framing/inc/OutputHandler.h
+++ b/cpp/common/framing/inc/OutputHandler.h
@@ -27,6 +27,7 @@ namespace framing {
 
     class OutputHandler{
     public:
+        virtual ~OutputHandler();
 	virtual void send(AMQFrame* frame) = 0;
     };
 
diff --git a/cpp/common/framing/inc/Value.h b/cpp/common/framing/inc/Value.h
index 3d525a0bef..fe939e8758 100644
--- a/cpp/common/framing/inc/Value.h
+++ b/cpp/common/framing/inc/Value.h
@@ -147,8 +147,8 @@ class EmptyValue : public Value {
     ~EmptyValue();
     virtual u_int32_t size() const { return 0; }
     virtual char getType() const { return 0; }
-    virtual void encode(Buffer& buffer) {}
-    virtual void decode(Buffer& buffer) {}
+    virtual void encode(Buffer& ) {}
+    virtual void decode(Buffer& ) {}
     virtual bool operator==(const Value& v) const {
         return dynamic_cast<const EmptyValue*>(&v);
     }