projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #1064: Test test_thread_pool_observer hangs.
[metaproxy-moved-to-github.git]
/
src
/
package.cpp
diff --git
a/src/package.cpp
b/src/package.cpp
index
1277b39
..
a3f173d
100644
(file)
--- 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 $
- Copyright (c) 2005-2006, Index Data.
+/* $Id: package.cpp,v 1.18 2007-01-25 14:05:54 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
*/
-#include "config.hpp"
+#include "config.hpp"
#include "package.hpp"
#include "package.hpp"
+#include <iostream>
+
namespace mp = metaproxy_1;
mp::Package::Package()
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;
}
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_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)
{
mp::Package & mp::Package::copy_filter(const Package &p)
{
+ delete m_route_pos;
m_route_pos = p.m_route_pos->clone();
return *this;
}
m_route_pos = p.m_route_pos->clone();
return *this;
}
@@
-60,23
+64,6
@@
mp::Session & mp::Package::session()
return m_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;
mp::Origin mp::Package::origin() const
{
return m_origin;
@@
-114,6
+101,14
@@
mp::Session mp::Package::session() const
{
return m_session;
}
{
return m_session;
}
+
+std::ostream& std::operator<<(std::ostream& os, mp::Package& p)
+{
+ os << p.origin() << " ";
+ os << p.session().id();
+ return os;
+}
+
/*
* Local variables:
/*
* Local variables: