X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;h=e87090c851f3ec093a7170d8ec41bf5bd3deea87;hb=0f91085e7a561979199a348aba002b265b8e4b48;hp=071477091d9eeddc2e6606276c2129843fa5d01b;hpb=baa590770e6d3729fbaef99277c669ab417e6d8f;p=metaproxy-moved-to-github.git

diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp
index 0714770..e87090c 100644
--- a/src/thread_pool_observer.cpp
+++ b/src/thread_pool_observer.cpp
@@ -1,6 +1,6 @@
 
-/* $Id: thread_pool_observer.cpp,v 1.12 2005-11-07 22:43:17 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: thread_pool_observer.cpp,v 1.15 2006-03-29 13:44:45 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
@@ -13,6 +13,10 @@
 #include <winsock.h>
 #endif
 
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
@@ -22,13 +26,15 @@
 
 #include <deque>
 
-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>
 #include <yaz/log.h>
 
 #include "thread_pool_observer.hpp"
 #include "pipe.hpp"
 
-namespace yp2 {
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1 {
     class ThreadPoolSocketObserver::Worker {
     public:
         Worker(ThreadPoolSocketObserver *s) : m_s(s) {};
@@ -59,7 +65,7 @@ namespace yp2 {
 
 
 using namespace yazpp_1;
-using namespace yp2;
+using namespace mp;
 
 ThreadPoolSocketObserver::Rep::Rep(ISocketObservable *obs)
     : m_socketObservable(obs), m_pipe(9123)