X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Frouter.hpp;h=34a4a35fc20ce3aaf2fb80aa8d16d21673f88e2b;hb=ea0a0e72e69c954962d25f92522bf0eb20281ec5;hp=480fe1fbb253f0b3bddd662ad2c946304c3d9370;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git

diff --git a/src/router.hpp b/src/router.hpp
index 480fe1f..34a4a35 100644
--- a/src/router.hpp
+++ b/src/router.hpp
@@ -1,7 +1,7 @@
-/* $Id: router.hpp,v 1.8 2006-01-09 13:43:59 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: router.hpp,v 1.12 2006-06-10 14:29:12 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #ifndef ROUTER_HPP
@@ -11,18 +11,12 @@
 #include <string>
 #include <stdexcept>
 
-#define ROUTE_POS 1
-
-namespace yp2 
+namespace metaproxy_1 
 {
     namespace filter {
         class Base;
     }
-#if ROUTE_POS
     class RoutePos;
-#else
-    class Package;
-#endif
     
     class RouterException : public std::runtime_error {
     public:
@@ -35,25 +29,15 @@ namespace yp2
         Router(){};
         virtual ~Router(){};
 
-#if ROUTE_POS
         virtual RoutePos *createpos() const = 0;
-#else
-        /// determines next Filter to use from current Filter and Package
-        virtual const filter::Base *move(const filter::Base *filter,
-                                         const Package *package) const = 0;
-#endif
     };
 
-
-#if ROUTE_POS
-    class RoutePos {
+    class RoutePos : boost::noncopyable {
     public:
-        virtual const filter::Base *move() = 0;
+        virtual const filter::Base *move(const char *route) = 0;
         virtual RoutePos *clone() = 0;
         virtual ~RoutePos() {};
     };
-#endif
-
 }
 #endif
 /*