4 files changed, 5 insertions, 3 deletions
diff --git a/cpp/client/inc/IncomingMessage.h b/cpp/client/inc/IncomingMessage.h
index 04b1fb40ba..90fed17ee0 100644
--- a/cpp/client/inc/IncomingMessage.h
+++ b/cpp/client/inc/IncomingMessage.h
@@ -35,7 +35,7 @@ namespace client {
 	qpid::framing::AMQHeaderBody::shared_ptr header;
 	std::vector<qpid::framing::AMQContentBody::shared_ptr> content;
 
-	long contentSize();
+	u_int64_t contentSize();
     public:
 	IncomingMessage(qpid::framing::BasicDeliverBody::shared_ptr intro);
 	IncomingMessage(qpid::framing::BasicReturnBody::shared_ptr intro);
diff --git a/cpp/client/inc/Message.h b/cpp/client/inc/Message.h
index f8a5aef565..fc3ec34bcf 100644
--- a/cpp/client/inc/Message.h
+++ b/cpp/client/inc/Message.h
@@ -38,10 +38,10 @@ namespace client {
 	~Message();
 	
 	inline std::string getData(){ return data; }
-	inline void setData(const std::string& data){ this->data = data; }
+	inline void setData(const std::string& _data){ data = _data; }
 
 	inline bool isRedelivered(){ return redelivered; }
-	inline void setRedelivered(bool redelivered){ this->redelivered = redelivered; }
+	inline void setRedelivered(bool _redelivered){  redelivered = _redelivered; }
 
         inline u_int64_t getDeliveryTag(){ return deliveryTag; }
 
diff --git a/cpp/client/inc/MessageListener.h b/cpp/client/inc/MessageListener.h
index 47307a4df5..81b80ff5cb 100644
--- a/cpp/client/inc/MessageListener.h
+++ b/cpp/client/inc/MessageListener.h
@@ -27,6 +27,7 @@ namespace client {
 
     class MessageListener{
     public:
+        virtual ~MessageListener();
 	virtual void received(Message& msg) = 0;
     };
 
diff --git a/cpp/client/inc/ReturnedMessageHandler.h b/cpp/client/inc/ReturnedMessageHandler.h
index 0117778fde..0d30d0ab32 100644
--- a/cpp/client/inc/ReturnedMessageHandler.h
+++ b/cpp/client/inc/ReturnedMessageHandler.h
@@ -27,6 +27,7 @@ namespace client {
 
     class ReturnedMessageHandler{
     public:
+        virtual ~ReturnedMessageHandler();
 	virtual void returned(Message& msg) = 0;
     };