X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftstthreads.cpp;h=f721f40948f66338458033183d28d78f6bc6d2b3;hb=850cba55769a7ed94d4da0e7c05b823e54ce3cc3;hp=ae54b792c2e35b27c821d0fb5715f56f7b9bff29;hpb=7f81d5b3aa6b9d7e4c5c1e02c91dd416eb97d19e;p=yazproxy-moved-to-github.git

diff --git a/src/tstthreads.cpp b/src/tstthreads.cpp
index ae54b79..f721f40 100644
--- a/src/tstthreads.cpp
+++ b/src/tstthreads.cpp
@@ -1,4 +1,4 @@
-/* $Id: tstthreads.cpp,v 1.3 2005-05-30 20:08:58 adam Exp $
+/* $Id: tstthreads.cpp,v 1.5 2005-06-08 13:29:03 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -27,6 +27,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/log.h>
 #include "msg-thread.h"
 
+using namespace yazpp_1;
+
 class My_Msg : public IMsg_Thread {
 public:
     IMsg_Thread *handle();
@@ -50,23 +52,23 @@ void My_Msg::result()
     printf("My_Msg::result val=%d\n", m_val);
 }
 
-class My_Timer_Thread : public IYazSocketObserver {
+class My_Timer_Thread : public ISocketObserver {
 private:
-    IYazSocketObservable *m_obs;
+    ISocketObservable *m_obs;
     int m_fd[2];
     Msg_Thread *m_t;
 public:
-    My_Timer_Thread(IYazSocketObservable *obs, Msg_Thread *t);
+    My_Timer_Thread(ISocketObservable *obs, Msg_Thread *t);
     void socketNotify(int event);
 };
 
-My_Timer_Thread::My_Timer_Thread(IYazSocketObservable *obs,
+My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
 				 Msg_Thread *t) : m_obs(obs) 
 {
     pipe(m_fd);
     m_t = t;
     obs->addObserver(m_fd[0], this);
-    obs->maskObserver(this, YAZ_SOCKET_OBSERVE_READ);
+    obs->maskObserver(this, SOCKET_OBSERVE_READ);
     obs->timeoutObserver(this, 2);
 }
 
@@ -81,7 +83,7 @@ void My_Timer_Thread::socketNotify(int event)
 
 int main(int argc, char **argv)
 {
-    Yaz_SocketManager mySocketManager;
+    SocketManager mySocketManager;
 
     Msg_Thread m(&mySocketManager);
     My_Timer_Thread t(&mySocketManager, &m) ;