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
code cleanup
[metaproxy-moved-to-github.git]
/
src
/
origin.cpp
diff --git
a/src/origin.cpp
b/src/origin.cpp
index
29f544b
..
0880c3a
100644
(file)
--- a/
src/origin.cpp
+++ b/
src/origin.cpp
@@
-1,12
+1,12
@@
-/* $Id: origin.cpp,v 1.2 2006-09-26 11:37:08 marc Exp $
+/* $Id: origin.cpp,v 1.3 2006-09-26 13:02:50 marc Exp $
Copyright (c) 2005-2006, Index Data.
See the LICENSE file for details
*/
Copyright (c) 2005-2006, Index Data.
See the LICENSE file for details
*/
-#include "config.hpp"
-#include "package.hpp"
+//#include "config.hpp"
+#include "origin.hpp"
#include <iostream>
#include <iostream>
@@
-14,7
+14,7
@@
namespace mp = metaproxy_1;
mp::Origin::Origin(std::string server_host,
unsigned int server_port)
mp::Origin::Origin(std::string server_host,
unsigned int server_port)
- : type(API), address(""), origin_id(0),
+ : m_type(API), m_address(""), m_origin_id(0),
m_server_host(server_host), m_server_port(server_port)
{
}
m_server_host(server_host), m_server_port(server_port)
{
}
@@
-32,18
+32,18
@@
unsigned int mp::Origin::server_port() const
void mp::Origin::set_tcpip_address(std::string addr, unsigned long s)
{
void mp::Origin::set_tcpip_address(std::string addr, unsigned long s)
{
- address = addr;
- origin_id = s;
- type = TCPIP;
+ m_type = TCPIP;
+ m_address = addr;
+ m_origin_id = s;
}
std::ostream& std::operator<<(std::ostream& os, mp::Origin& o)
{
}
std::ostream& std::operator<<(std::ostream& os, mp::Origin& o)
{
- if (o.address != "")
- os << o.address;
+ if (o.m_address != "")
+ os << o.m_address;
else
os << "0";
else
os << "0";
- os << ":" << o.origin_id;
+ os << ":" << o.m_origin_id;
return os;
}
return os;
}