Fix compile errors/warnings with gcc 4.3

 - added missing #includes that were implicitly included via old headers.
 - add namespace-qualifiers to fix "changes meaning of name" warnings.
 - ./qpid/ptr_map.h:51: fixed "qualified return value" warning.
 - use const char* for "conversion from string constant to ‘char*’" warnings

Applied patch from https://issues.apache.org/jira/browse/QPID-869
remove depenency on boost/date_time, causes warnings with gcc 4.3.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@640806 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 5 insertions, 4 deletions

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index ddd5959343..bbcdb9cbce 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -73,7 +73,7 @@ Broker::Options::Options(const std::string& name) :
     ack(0)
 {
     int c = sys::SystemInfo::concurrency();
-    workerThreads=std::max(2,c);
+    workerThreads=c+1;
     addOptions()
         ("data-dir", optValue(dataDir,"DIR"),
          "Directory to contain persistent data generated by the broker")
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 92e87cc9d8..165830151d 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -524,7 +524,7 @@ void Queue::setPolicy(std::auto_ptr<QueuePolicy> _policy)
     policy = _policy;
 }
 
-const QueuePolicy* const Queue::getPolicy()
+const QueuePolicy* Queue::getPolicy()
 {
     return policy.get();
 }
diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index deaa0d58a6..e33cd7e5d7 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -167,7 +167,7 @@ namespace qpid {
              */
             QueuedMessage dequeue();
 
-            const QueuePolicy* const getPolicy();
+            const QueuePolicy* getPolicy();
 
             void setAlternateExchange(boost::shared_ptr<Exchange> exchange);
             boost::shared_ptr<Exchange> getAlternateExchange();
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp
index 8c29a4a4ec..1b5bcc2f7e 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/cpp/src/qpid/broker/SemanticState.cpp
@@ -574,7 +574,8 @@ void SemanticState::ConsumerImpl::addMessageCredit(uint32_t value)
 
 void SemanticState::ConsumerImpl::flush()
 {
-    while(queue->dispatch(*this));
+    while(queue->dispatch(*this))
+        ;
     stop();
 }