X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;h=6bbe84b2e49bd7b1430a1ba6d24403dc485a9379;hb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;hp=9c7dfda85c23346eccef8e5cd903e59349da06bc;hpb=305de106cba7adf288c9349072084bdec12a436b;p=metaproxy-moved-to-github.git

diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp
index 9c7dfda..6bbe84b 100644
--- a/src/thread_pool_observer.cpp
+++ b/src/thread_pool_observer.cpp
@@ -1,8 +1,7 @@
+/* $Id: thread_pool_observer.cpp,v 1.17 2006-06-10 14:29:13 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-/* $Id: thread_pool_observer.cpp,v 1.13 2005-11-07 22:46:42 adam Exp $
-   Copyright (c) 2005, Index Data.
-
-%LICENSE%
+   See the LICENSE file for details
  */
 #include "config.hpp"
 
@@ -26,13 +25,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) {};
@@ -63,9 +62,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)
 {
 }
@@ -79,8 +78,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);