X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Frouter_flexml.hpp;h=d4c16eb99589bba602fb555827906938b639a201;hb=d0123337d70b0fb97b578cc57467bb94980f1014;hp=aa6812579fb9eb4ebb29c6a372624f47f4df8807;hpb=b87d59a4add20f61400cfb77a9256dd26c243fb7;p=metaproxy-moved-to-github.git

diff --git a/src/router_flexml.hpp b/src/router_flexml.hpp
index aa68125..d4c16eb 100644
--- a/src/router_flexml.hpp
+++ b/src/router_flexml.hpp
@@ -1,9 +1,24 @@
-/* $Id: router_flexml.hpp,v 1.12 2006-01-09 13:53:13 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2009 Index Data
 
-   %LICENSE%
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#ifndef ROUTER_FLEXML_HPP
+#define ROUTER_FLEXML_HPP
+
 #include "router.hpp"
 
 #include "factory_filter.hpp"
@@ -12,23 +27,25 @@
 
 #include <boost/scoped_ptr.hpp>
 
-namespace yp2 
+namespace metaproxy_1 
 {
-    class RouterFleXML : public yp2::Router 
+    class RouterFleXML : public metaproxy_1::Router 
     {
         class Rep;
         class Route;
         class Pos;
     public:
-        RouterFleXML(std::string xmlconf, yp2::FactoryFilter &factory);
-        RouterFleXML(xmlDocPtr doc, yp2::FactoryFilter &factory);
+        RouterFleXML(std::string xmlconf, metaproxy_1::FactoryFilter &factory,
+            bool test_only);
+        RouterFleXML(xmlDocPtr doc, metaproxy_1::FactoryFilter &factory,
+            bool test_only);
         
         ~RouterFleXML();
 
         virtual RoutePos *createpos() const;
-        class XMLError : public std::runtime_error {
+        class XMLError1 : public std::runtime_error {
         public:
-            XMLError(const std::string msg) :
+            XMLError1(const std::string msg) :
                 std::runtime_error("XMLError : " + msg) {} ;
         };
     private:
@@ -36,13 +53,14 @@ namespace yp2
     };
  
 };
-
+#endif
 
 /*
  * 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
  */
+