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
fa9889d
..
a3f173d
100644
(file)
--- a/
src/package.cpp
+++ b/
src/package.cpp
@@
-1,5
+1,5
@@
-/* $Id: package.cpp,v 1.11 2006-08-30 08:35:03 marc 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.
See the LICENSE file for details
*/
See the LICENSE file for details
*/
@@
-13,7
+13,7
@@
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)
{
}
{
}
@@
-24,10
+24,11
@@
mp::Package::~Package()
mp::Package::Package(mp::Session &session, const mp::Origin &origin)
: m_session(session), m_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;
mp::Package & mp::Package::copy_filter(const Package &p)
{
delete m_route_pos;
@@
-63,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;
@@
-120,18
+104,8
@@
mp::Session mp::Package::session() const
std::ostream& std::operator<<(std::ostream& os, mp::Package& p)
{
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;
}
return os;
}