Windows: use Boost 1.59, msvc 14.0

[metaproxy-moved-to-github.git] / src / router_flexml.hpp

diff --git a/src/router_flexml.hpp b/src/router_flexml.hpp
index d4c16eb..9b5d890 100644 (file)
--- a/src/router_flexml.hpp
+++ b/src/router_flexml.hpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2009 Index Data
+   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
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef ROUTER_FLEXML_HPP
 #define ROUTER_FLEXML_HPP
 
-#include "router.hpp"
+#include <metaproxy/router.hpp>
 
 #include "factory_filter.hpp"
 
@@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <boost/scoped_ptr.hpp>
 
-namespace metaproxy_1 
+namespace metaproxy_1
 {
-    class RouterFleXML : public metaproxy_1::Router 
+    class RouterFleXML : public metaproxy_1::Router
     {
         class Rep;
         class Route;
@@ -38,20 +38,17 @@ namespace metaproxy_1
         RouterFleXML(std::string xmlconf, metaproxy_1::FactoryFilter &factory,
             bool test_only);
         RouterFleXML(xmlDocPtr doc, metaproxy_1::FactoryFilter &factory,
-            bool test_only);
-        
+                     bool test_only, const char *file_include_path);
+
         ~RouterFleXML();
 
         virtual RoutePos *createpos() const;
-        class XMLError1 : public std::runtime_error {
-        public:
-            XMLError1(const std::string msg) :
-                std::runtime_error("XMLError : " + msg) {} ;
-        };
+        void start();
+        void stop(int signo);
     private:
         boost::scoped_ptr<Rep> m_p;
     };
- 
+
 };
 #endif