svn commit: r881679 - in /qpid/trunk/qpid/cpp/src/qpid: Plugin.cpp broker/QueueListeners.cpp framing/Uuid.cpp sys/posix/Fork.cpp

[as...@apache.org]

Author: astitcher
Date: Wed Nov 18 06:11:59 2009
New Revision: 881679

URL: http://svn.apache.org/viewvc?rev=881679&view=rev
Log:
Changes to compile under  SunCC 5.10

Modified:
    qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp
    qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.cpp
    qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.cpp
    qpid/trunk/qpid/cpp/src/qpid/sys/posix/Fork.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp?rev=881679&r1=881678&r2=881679&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp Wed Nov 18 06:11:59 2009
@@ -42,7 +42,7 @@
 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();
 }
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.cpp?rev=881679&r1=881678&r2=881679&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.cpp Wed Nov 18 06:11:59 2009
@@ -69,13 +69,13 @@
 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

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.cpp?rev=881679&r1=881678&r2=881679&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.cpp Wed Nov 18 06:11:59 2009
@@ -43,7 +43,9 @@
 }
 
 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() {

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/Fork.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Fork.cpp?rev=881679&r1=881678&r2=881679&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/Fork.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/Fork.cpp Wed Nov 18 06:11:59 2009
@@ -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>
 



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org