X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fp2.cpp;h=038afcda36a2ba7fdce4bbe812259a94bf17d078;hb=f82b19f2b93707657fee804bd1242f2548d51ada;hp=11f8716d7c5fab9102f4e2fe2ee25a7d3fe39819;hpb=c64f3428802f61a7f087e410d9d0972f5a805f65;p=metaproxy-moved-to-github.git

diff --git a/src/p2.cpp b/src/p2.cpp
index 11f8716..038afcd 100644
--- a/src/p2.cpp
+++ b/src/p2.cpp
@@ -1,4 +1,9 @@
-/* $Id: p2.cpp,v 1.1 2005-10-06 09:37:25 marc Exp $
+/* $Id: p2.cpp,v 1.5 2005-10-15 14:09:09 adam Exp $
+   Copyright (c) 2005, Index Data.
+
+%LICENSE%
+ */
+/* $Id: p2.cpp,v 1.5 2005-10-15 14:09:09 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -25,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/diagbib1.h>
 #include <yaz/options.h>
 
+#include "config.hpp"
 #include <yaz++/socket-manager.h>
 #include "p2_config.h"
 #include "p2_frontend.h"
@@ -57,7 +63,7 @@ void P2_Server::unlockConfig()
 }
 
 P2_Server::P2_Server(IPDU_Observable *the_PDU_Observable,
-                     Msg_Thread *my_thread,
+                     yp2::ThreadPoolSocketObserver *my_thread,
                      P2_Config *config,
                      P2_ModuleFactory *modules)
     :  Z_Assoc(the_PDU_Observable)
@@ -117,7 +123,8 @@ int main(int argc, char **argv)
 
     PDU_Assoc *my_PDU_Assoc = 0;
     
-    Msg_Thread my_thread(&mySocketManager, config.m_no_threads);
+    yp2::ThreadPoolSocketObserver my_thread(&mySocketManager,
+                                            config.m_no_threads);
 
     my_PDU_Assoc = new PDU_Assoc(&mySocketManager);
 
@@ -140,6 +147,7 @@ int main(int argc, char **argv)
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */