X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_pipe.cpp;h=0f72f7c0851ec6125236c8bc6d37048f419bb1c9;hb=17981d61e25178362e3041a3e0090f0852514fe1;hp=94e2d8b900b7cd3c1e4caa6796f55e5a1909a102;hpb=0264192f26c10308aad161983ea29568c96521a6;p=metaproxy-moved-to-github.git

diff --git a/src/test_pipe.cpp b/src/test_pipe.cpp
index 94e2d8b..0f72f7c 100644
--- a/src/test_pipe.cpp
+++ b/src/test_pipe.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_pipe.cpp,v 1.12 2007-11-02 17:47:41 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,10 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 #include <errno.h>
@@ -38,7 +35,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <iostream>
 #include <stdexcept>
 
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 #include "pipe.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
@@ -63,7 +60,7 @@ public:
 
 
 Timer::Timer(yazpp_1::ISocketObservable *obs,
-				 int duration) : 
+				 int duration) :
     m_obs(obs), m_pipe(9122), m_data(false), m_timeout(false)
 {
     obs->addObserver(m_pipe.read_fd(), this);
@@ -107,7 +104,7 @@ void Timer::socketNotify(int event)
 BOOST_AUTO_TEST_CASE( test_pipe_1 )
 {
     yazpp_1::SocketManager mySocketManager;
-    
+
     Timer t(&mySocketManager, 1);
 
     while (mySocketManager.processEvent() > 0)
@@ -120,8 +117,9 @@ BOOST_AUTO_TEST_CASE( test_pipe_1 )
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+