X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpackage.cpp;h=6ac07ac30b3e1ece21d8b2d094d6f1565f6c27f6;hb=9f255f52501e9429f643772a186cc7a72a5e8893;hp=d128f4fd2ebdff55765306b4a93d1cfe147871ec;hpb=20a0ee8ffcc06380daaad873d35a9a0c24783963;p=metaproxy-moved-to-github.git

diff --git a/src/package.cpp b/src/package.cpp
index d128f4f..6ac07ac 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,4 +1,4 @@
-/* $Id: package.cpp,v 1.12 2006-08-30 08:44:58 marc Exp $
+/* $Id: package.cpp,v 1.16 2006-08-30 14:37:11 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -28,12 +28,6 @@ mp::Package::Package(mp::Session &session, const mp::Origin &origin)
 {
 }
 
-mp::Package::Package(mp::Session &session,
-                     const mp::Origin &origin, const mp::Origin &target) 
-    : m_session(session), m_origin(origin), m_target(target),
-      m_route_pos(0), m_data(0)
-{
-}
 
 mp::Package & mp::Package::copy_filter(const Package &p)
 {
@@ -103,22 +97,6 @@ mp::Package & mp::Package::origin(const Origin & origin)
     return *this;
 }
 
-mp::Origin mp::Package::target() const 
-{
-    return m_target;
-}
-        
-mp::Origin & mp::Package::target()
-{
-    return m_target;
-}
-
-mp::Package & mp::Package::target(const Origin & target)
-{
-    m_target = target;
-    return *this;
-}
-
 mp::Package & mp::Package::router(const mp::Router &router)
 {
     m_route_pos = router.createpos();
@@ -143,18 +121,8 @@ mp::Session mp::Package::session() const
 
 std::ostream& std::operator<<(std::ostream& os,  mp::Package& p)
 {
-    os << p.session().id() << " ";
-    os << p.origin();
-    return os;
-}
-
-std::ostream& std::operator<<(std::ostream& os,  mp::Origin& o)
-{
-    if (o.address != "")
-        os << o.address;
-    else
-        os << "0";
-    os << ":" << o.port;
+    os << p.origin() << " ";
+    os << p.session().id();
     return os;
 }