X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpackage.cpp;h=2b2c84c17c562d628af13c90277b539b54f95fd6;hb=c93d8c8db5ae24e01775060677f8e8e9c2afff34;hp=1277b39e3ea373edaed37ef0063fab607f623616;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git

diff --git a/src/package.cpp b/src/package.cpp
index 1277b39..2b2c84c 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,17 +1,19 @@
-/* $Id: package.cpp,v 1.7 2006-03-16 10:40:59 adam Exp $
+/* $Id: package.cpp,v 1.17 2006-09-14 19:53:57 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
-#include "config.hpp"
 
+#include "config.hpp"
 #include "package.hpp"
 
+#include <iostream>
+
 namespace mp = metaproxy_1;
 
 mp::Package::Package() 
-    : m_route_pos(0), m_data(0)
+    : m_route_pos(0)
 {
 }
 
@@ -20,14 +22,16 @@ mp::Package::~Package()
     delete m_route_pos;
 }
 
-mp::Package::Package(mp::Session &session, mp::Origin &origin) 
+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)
 {
 }
 
+
 mp::Package & mp::Package::copy_filter(const Package &p)
 {
+    delete m_route_pos;
     m_route_pos = p.m_route_pos->clone();
     return *this;
 }
@@ -60,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;
@@ -114,6 +101,14 @@ mp::Session mp::Package::session() const
 {
     return m_session;
 }
+
+std::ostream& std::operator<<(std::ostream& os,  mp::Package& p)
+{
+    os << p.origin() << " ";
+    os << p.session().id();
+    return os;
+}
+
                 
 /*
  * Local variables: