diff options
author | Markus Grüneis <gimpf@gimpf.org> | 2010-02-18 09:15:27 +0000 |
---|---|---|
committer | Markus Grüneis <gimpf@gimpf.org> | 2010-02-18 09:15:27 +0000 |
commit | e191eab68d905bfe14e3590a92fa653f0ae2ebce (patch) | |
tree | a5837b067ecab92c645008b537087b0d163ef1ab /src/networkAddress.h | |
parent | whitespace only change: unified formatting with "astyle --style=k/r --indent=... (diff) |
non-functional changes only: use standard writing of stdint.h types; still import from boost (compiler compatibility)
Diffstat (limited to 'src/networkAddress.h')
-rw-r--r-- | src/networkAddress.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/networkAddress.h b/src/networkAddress.h index df4f788..1d4c602 100644 --- a/src/networkAddress.h +++ b/src/networkAddress.h @@ -62,13 +62,13 @@ public: NetworkAddress(const std::string&); NetworkAddress(boost::asio::ip::address_v6); NetworkAddress(boost::asio::ip::address_v4); - NetworkAddress(u_int64_t); + NetworkAddress(uint64_t); NetworkAddress(const network_address_type_t type, const std::string& address); ~NetworkAddress(); void setNetworkAddress(const network_address_type_t type, const std::string& address); void setNetworkAddress(boost::asio::ip::address_v4); void setNetworkAddress(boost::asio::ip::address_v6); - void setNetworkAddress(u_int64_t); + void setNetworkAddress(uint64_t); network_address_type_t getNetworkAddressType() const; std::string toString() const; bool operator<(const NetworkAddress& s) const; @@ -77,12 +77,12 @@ public: ethernet_bytes_type to_bytes_ethernet() const; const boost::asio::ip::address_v4& getNetworkAddressV4() const; const boost::asio::ip::address_v6& getNetworkAddressV6() const; - const u_int64_t getNetworkAdrressEther() const; + const uint64_t getNetworkAdrressEther() const; protected: Mutex mutex_; boost::asio::ip::address_v4 ipv4_address_; boost::asio::ip::address_v6 ipv6_address_; - u_int64_t ethernet_address_; + uint64_t ethernet_address_; network_address_type_t network_address_type_; private: NetworkAddress operator=(const NetworkAddress& s); |