3 files changed, 4 insertions, 4 deletions
diff --git a/cpp/broker/inc/Channel.h b/cpp/broker/inc/Channel.h
index a5a54aea1f..862d249ce1 100644
--- a/cpp/broker/inc/Channel.h
+++ b/cpp/broker/inc/Channel.h
@@ -146,8 +146,8 @@ namespace qpid {
             ~Channel();
             inline void setDefaultQueue(Queue::shared_ptr queue){ defaultQueue = queue; }
             inline Queue::shared_ptr getDefaultQueue(){ return defaultQueue; }
-            inline u_int32_t setPrefetchSize(u_int32_t size){ prefetchSize = size; }
-            inline u_int16_t setPrefetchCount(u_int16_t count){ prefetchCount = count; }
+            inline u_int32_t setPrefetchSize(u_int32_t size){ return prefetchSize = size; }
+            inline u_int16_t setPrefetchCount(u_int16_t count){ return prefetchCount = count; }
             bool exists(const string& consumerTag);
             void consume(string& tag, Queue::shared_ptr queue, bool acks, bool exclusive, ConnectionToken* const connection = 0);
             void cancel(const string& tag);
diff --git a/cpp/broker/inc/Exchange.h b/cpp/broker/inc/Exchange.h
index 4066f5ac20..1fdc00fae5 100644
--- a/cpp/broker/inc/Exchange.h
+++ b/cpp/broker/inc/Exchange.h
@@ -27,7 +27,7 @@ namespace broker {
     class Exchange{
         const std::string name;
       public:
-        explicit Exchange(const std::string& name) : name(name) {}
+        explicit Exchange(const std::string& _name) : name(_name) {}
         virtual ~Exchange(){}
         std::string getName() { return name; }
         virtual void bind(Queue::shared_ptr queue, const string& routingKey, qpid::framing::FieldTable* args) = 0;
diff --git a/cpp/broker/inc/TopicExchange.h b/cpp/broker/inc/TopicExchange.h
index 68a4026ee7..227280103f 100644
--- a/cpp/broker/inc/TopicExchange.h
+++ b/cpp/broker/inc/TopicExchange.h
@@ -57,7 +57,7 @@ class TopicPattern : public Tokens
     TopicPattern(const Tokens& tokens) { operator=(tokens); }
     TopicPattern(const std::string& str) { operator=(str); }
     TopicPattern& operator=(const Tokens&);
-    TopicPattern& operator=(const std::string& str) { operator=(Tokens(str)); }
+    TopicPattern& operator=(const std::string& str) { return operator=(Tokens(str)); }
     
     /** Match a topic */
     bool match(const std::string& topic) { return match(Tokens(topic)); }