X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpackage.cpp;h=2b2c84c17c562d628af13c90277b539b54f95fd6;hb=1648ce02e4909b932a908beaeae93fd41515b9e5;hp=d5559d04c98e120fe24cbde30574e4ad510dcd99;hpb=6bae168228128b1c87b5c531f559050b7e5603cf;p=metaproxy-moved-to-github.git

diff --git a/src/package.cpp b/src/package.cpp
index d5559d0..2b2c84c 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,4 +1,4 @@
-/* $Id: package.cpp,v 1.14 2006-08-30 09:56:41 marc Exp $
+/* $Id: package.cpp,v 1.17 2006-09-14 19:53:57 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -13,7 +13,7 @@
 namespace mp = metaproxy_1;
 
 mp::Package::Package() 
-    : m_route_pos(0), m_data(0)
+    : m_route_pos(0)
 {
 }
 
@@ -24,7 +24,7 @@ mp::Package::~Package()
 
 mp::Package::Package(mp::Session &session, const mp::Origin &origin) 
     : m_session(session), m_origin(origin),
-      m_route_pos(0), m_data(0)
+      m_route_pos(0)
 {
 }
 
@@ -64,23 +64,6 @@ mp::Session & mp::Package::session()
     return m_session;
 }
 
-
-int mp::Package::data() const
-{
-    return m_data;
-}
-
-int & mp::Package::data()
-{
-    return m_data;
-}
-        
-mp::Package & mp::Package::data(const int & data)
-{
-    m_data = data;
-    return *this;
-}
-
 mp::Origin mp::Package::origin() const 
 {
     return m_origin;
@@ -121,18 +104,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;
 }