QPID-1198 (Partial): Added explicit namespaces that the Sun C++ requires (that gcc doesn't)

Patches from Manuel Teira.
It's not clear at this point whether there is a compiler problem with gcc that it does find
the symbols in the namespaces or SunCC that it doesn't!


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

5 files changed, 9 insertions, 9 deletions

diff --git a/cpp/src/qpid/broker/DtxWorkRecord.cpp b/cpp/src/qpid/broker/DtxWorkRecord.cpp
index 2f3febed1e..cc79813dab 100644
--- a/cpp/src/qpid/broker/DtxWorkRecord.cpp
+++ b/cpp/src/qpid/broker/DtxWorkRecord.cpp
@@ -79,7 +79,7 @@ bool DtxWorkRecord::commit(bool onePhase)
             store->commit(*txn);
             txn.reset();
             
-            for_each(work.begin(), work.end(), mem_fn(&TxBuffer::commit));
+            std::for_each(work.begin(), work.end(), mem_fn(&TxBuffer::commit));
             return true;
         } else {
             //1pc commit optimisation, don't need a 2pc transaction context:
@@ -89,7 +89,7 @@ bool DtxWorkRecord::commit(bool onePhase)
             std::auto_ptr<TransactionContext> localtxn = store->begin();
             if (prepare(localtxn.get())) {
                 store->commit(*localtxn);
-                for_each(work.begin(), work.end(), mem_fn(&TxBuffer::commit));
+                std::for_each(work.begin(), work.end(), mem_fn(&TxBuffer::commit));
                 return true;
             } else {
                 store->abort(*localtxn);
@@ -149,7 +149,7 @@ void DtxWorkRecord::abort()
         store->abort(*txn);
         txn.reset();
     }
-    for_each(work.begin(), work.end(), mem_fn(&TxBuffer::rollback));
+    std::for_each(work.begin(), work.end(), mem_fn(&TxBuffer::rollback));
 }
 
 void DtxWorkRecord::recover(std::auto_ptr<TPCTransactionContext> _txn, DtxBuffer::shared_ptr ops)
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index d718acff03..18a3574cdd 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -292,13 +292,13 @@ void Queue::removeListener(Consumer& c)
 {
     Mutex::ScopedLock locker(messageLock);
     notifierLock.wait(messageLock);//wait until no notifies are in progress 
-    Listeners::iterator i = find(listeners.begin(), listeners.end(), &c);
+    Listeners::iterator i = std::find(listeners.begin(), listeners.end(), &c);
     if (i != listeners.end()) listeners.erase(i);
 }
 
 void Queue::addListener(Consumer& c)
 {
-    Listeners::iterator i = find(listeners.begin(), listeners.end(), &c);
+    Listeners::iterator i = std::find(listeners.begin(), listeners.end(), &c);
     if (i == listeners.end()) listeners.push_back(&c);
 }
 
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp
index e1589aea99..59f837f1d0 100644
--- a/cpp/src/qpid/broker/SessionAdapter.cpp
+++ b/cpp/src/qpid/broker/SessionAdapter.cpp
@@ -302,7 +302,7 @@ void SessionAdapter::QueueHandlerImpl::delete_(const string& queue, bool ifUnuse
     }else{
         //remove the queue from the list of exclusive queues if necessary
         if(q->isExclusiveOwner(&getConnection())){
-            QueueVector::iterator i = find(getConnection().exclusiveQueues.begin(), getConnection().exclusiveQueues.end(), q);
+            QueueVector::iterator i = std::find(getConnection().exclusiveQueues.begin(), getConnection().exclusiveQueues.end(), q);
             if(i < getConnection().exclusiveQueues.end()) getConnection().exclusiveQueues.erase(i);
         }
         q->destroy();
diff --git a/cpp/src/qpid/broker/TopicExchange.cpp b/cpp/src/qpid/broker/TopicExchange.cpp
index cfd9ef7a9b..48d6e88503 100644
--- a/cpp/src/qpid/broker/TopicExchange.cpp
+++ b/cpp/src/qpid/broker/TopicExchange.cpp
@@ -36,7 +36,7 @@ Tokens& Tokens::operator=(const std::string& s) {
     std::string::const_iterator i = s.begin();
     while (true) {
         // Invariant: i is at the beginning of the next untokenized word.
-        std::string::const_iterator j = find(i, s.end(), '.');
+        std::string::const_iterator j = std::find(i, s.end(), '.');
         push_back(std::string(i, j));
         if (j == s.end()) return *this;
         i = j + 1;
diff --git a/cpp/src/qpid/broker/TxBuffer.cpp b/cpp/src/qpid/broker/TxBuffer.cpp
index cdc5b37dfd..8fe2c17bf0 100644
--- a/cpp/src/qpid/broker/TxBuffer.cpp
+++ b/cpp/src/qpid/broker/TxBuffer.cpp
@@ -37,13 +37,13 @@ bool TxBuffer::prepare(TransactionContext* const ctxt)
 
 void TxBuffer::commit()
 {
-    for_each(ops.begin(), ops.end(), mem_fn(&TxOp::commit));
+    std::for_each(ops.begin(), ops.end(), mem_fn(&TxOp::commit));
     ops.clear();
 }
 
 void TxBuffer::rollback()
 {
-    for_each(ops.begin(), ops.end(), mem_fn(&TxOp::rollback));
+    std::for_each(ops.begin(), ops.end(), mem_fn(&TxOp::rollback));
     ops.clear();
 }