Changes to compile under SunCC 5.10

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

4 files changed, 9 insertions, 5 deletions

diff --git a/qpid/cpp/src/qpid/Plugin.cpp b/qpid/cpp/src/qpid/Plugin.cpp
index a37479a020..4368e15d27 100644
--- a/qpid/cpp/src/qpid/Plugin.cpp
+++ b/qpid/cpp/src/qpid/Plugin.cpp
@@ -42,7 +42,7 @@ void invoke(boost::function<void()> f) { f(); }
 Plugin::Target::~Target() { finalize(); }
 
 void Plugin::Target::finalize() {
-    for_each(finalizers.begin(), finalizers.end(), invoke);
+    std::for_each(finalizers.begin(), finalizers.end(), invoke);
     finalizers.clear();
 }
 
diff --git a/qpid/cpp/src/qpid/broker/QueueListeners.cpp b/qpid/cpp/src/qpid/broker/QueueListeners.cpp
index 99f30544e2..951de2184a 100644
--- a/qpid/cpp/src/qpid/broker/QueueListeners.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueListeners.cpp
@@ -69,13 +69,13 @@ void QueueListeners::remove(Listeners& listeners, Consumer::shared_ptr c)
 void QueueListeners::NotificationSet::notify()
 {
     if (consumer) consumer->notify();
-    else for_each(browsers.begin(), browsers.end(), boost::mem_fn(&Consumer::notify));
+    else std::for_each(browsers.begin(), browsers.end(), boost::mem_fn(&Consumer::notify));
 }
 
 bool QueueListeners::contains(Consumer::shared_ptr c) const {
     return
-        find(browsers.begin(), browsers.end(), c) != browsers.end() ||
-        find(consumers.begin(), consumers.end(), c) != consumers.end();
+        std::find(browsers.begin(), browsers.end(), c) != browsers.end() ||
+        std::find(consumers.begin(), consumers.end(), c) != consumers.end();
 }
 
 }} // namespace qpid::broker
diff --git a/qpid/cpp/src/qpid/framing/Uuid.cpp b/qpid/cpp/src/qpid/framing/Uuid.cpp
index 71fa6a7329..f7c13ad8d4 100644
--- a/qpid/cpp/src/qpid/framing/Uuid.cpp
+++ b/qpid/cpp/src/qpid/framing/Uuid.cpp
@@ -43,7 +43,9 @@ Uuid::Uuid(const uint8_t* data) {
 }
 
 void Uuid::assign(const uint8_t* data) {
-    uuid_copy(c_array(), data);
+    // This const cast is for Solaris which has a 
+    // uuid_copy that takes a non const 2nd argument
+    uuid_copy(c_array(), const_cast<uint8_t*>(data));
 }
 
 void Uuid::generate() {
diff --git a/qpid/cpp/src/qpid/sys/posix/Fork.cpp b/qpid/cpp/src/qpid/sys/posix/Fork.cpp
index ec3af620ef..a0d404a16e 100644
--- a/qpid/cpp/src/qpid/sys/posix/Fork.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Fork.cpp
@@ -22,7 +22,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <sys/select.h>
 #include <sys/types.h>
 #include <unistd.h>