Rename from yp2 to metaproxy. The namespace for all definitions

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

diff --git a/src/router.hpp b/src/router.hpp
index 480fe1f..d59b741 100644 (file)
--- a/src/router.hpp
+++ b/src/router.hpp
@@ -1,5 +1,5 @@
-/* $Id: router.hpp,v 1.8 2006-01-09 13:43:59 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: router.hpp,v 1.11 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
@@ -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
 /*