X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Forigin.cpp;h=0880c3a32d8d8f62d7fbae2599bcd215360da3f2;hb=5beddc7e2432ca7eda40eacf025e9bbbbc026a86;hp=29f544ba4d56eeb09d0d5cf05adf390e0dd2f68d;hpb=ef66a2136e7bc6bd0b9821d880ab949687159aa1;p=metaproxy-moved-to-github.git

diff --git a/src/origin.cpp b/src/origin.cpp
index 29f544b..0880c3a 100644
--- 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
  */
 
 
-#include "config.hpp"
-#include "package.hpp"
+//#include "config.hpp"
+#include "origin.hpp"
 
 #include <iostream>
 
@@ -14,7 +14,7 @@ namespace mp = metaproxy_1;
 
 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)
 {
 }
@@ -32,18 +32,18 @@ unsigned int mp::Origin::server_port() const
 
 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)
 {
-    if (o.address != "")
-        os << o.address;
+    if (o.m_address != "")
+        os << o.m_address;
     else
         os << "0";
-    os << ":" << o.origin_id;
+    os << ":" << o.m_origin_id;
     return os;
 }