X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;h=061ec8f209e2d82bdfa41d9a6d801d19d05c91f9;hb=9dec54edaf1536d72030e95123c77040fc951185;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..061ec8f 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.16 2006-06-09 14:12:13 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,13 @@
 
 #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 metaproxy_1 {
     class ThreadPoolSocketObserver::Worker {
     public:
         Worker(ThreadPoolSocketObserver *s) : m_s(s) {};
@@ -59,9 +63,9 @@ namespace yp2 {
 
 
 using namespace yazpp_1;
-using namespace yp2;
+using namespace metaproxy_1;
 
-ThreadPoolSocketObserver::Rep::Rep(ISocketObservable *obs)
+ThreadPoolSocketObserver::Rep::Rep(yazpp_1::ISocketObservable *obs)
     : m_socketObservable(obs), m_pipe(9123)
 {
 }
@@ -75,8 +79,8 @@ IThreadPoolMsg::~IThreadPoolMsg()
 
 }
 
-ThreadPoolSocketObserver::ThreadPoolSocketObserver(ISocketObservable *obs,
-                                                   int no_threads)
+ThreadPoolSocketObserver::ThreadPoolSocketObserver(
+    yazpp_1::ISocketObservable *obs, int no_threads)
     : m_p(new Rep(obs))
 {
     obs->addObserver(m_p->m_pipe.read_fd(), this);