ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-21 11:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated IPAddress

Browse Source
This commit is contained in:
Vinnie Falco
2014-02-17 08:50:32 -08:00
parent e219008320
commit c48b9244f2
5 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beast/Net.h
View File

@@ -23,15 +23,9 @@
#include "net/BufferType.h" #include "net/BufferType.h"
#include "net/DynamicBuffer.h" #include "net/DynamicBuffer.h"
#include "net/IPAddress.h" #include "net/IPEndpoint.h"
#include "net/IPAddressV4.h" #include "net/IPAddressV4.h"
#include "net/IPAddressV6.h" #include "net/IPAddressV6.h"
#include "net/IPEndpoint.h" #include "net/IPEndpoint.h"
// VFALCO DEPRECATED, REMOVE ASAP!
namespace beast {
typedef IP::Endpoint IPAddress;
}
#endif #endif

4
beast/insight/StatsDCollector.h
View File

@@ -22,7 +22,7 @@
#include "Collector.h" #include "Collector.h"
#include "../net/IPAddress.h" #include "../net/IPEndpoint.h"
namespace beast { namespace beast {
namespace insight { namespace insight {
@@ -39,7 +39,7 @@ public:
@param prefix A string pre-pended before each metric name. @param prefix A string pre-pended before each metric name.
@param journal Destination for logging output. @param journal Destination for logging output.
*/ */
static std::shared_ptr <StatsDCollector> New (IPAddress const& address, static std::shared_ptr <StatsDCollector> New (IP::Endpoint const& address,
std::string const& prefix, Journal journal); std::string const& prefix, Journal journal);
}; };

8
beast/insight/impl/StatsDCollector.cpp
View File

@@ -200,7 +200,7 @@ private:
typedef SharedData <StateType> State; typedef SharedData <StateType> State;
Journal m_journal; Journal m_journal;
IPAddress m_address; IP::Endpoint m_address;
std::string m_prefix; std::string m_prefix;
boost::asio::io_service m_io_service; boost::asio::io_service m_io_service;
boost::optional <boost::asio::io_service::work> m_work; boost::optional <boost::asio::io_service::work> m_work;
@@ -213,7 +213,7 @@ private:
std::thread m_thread; std::thread m_thread;
static boost::asio::ip::udp::endpoint to_endpoint ( static boost::asio::ip::udp::endpoint to_endpoint (
IPAddress const &address) IP::Endpoint const &address)
{ {
if (address.is_v4 ()) if (address.is_v4 ())
{ {
@@ -230,7 +230,7 @@ private:
public: public:
StatsDCollectorImp ( StatsDCollectorImp (
IPAddress const& address, IP::Endpoint const& address,
std::string const& prefix, std::string const& prefix,
Journal journal) Journal journal)
: m_journal (journal) : m_journal (journal)
@@ -697,7 +697,7 @@ void StatsDMeterImpl::do_process ()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
std::shared_ptr <StatsDCollector> StatsDCollector::New ( std::shared_ptr <StatsDCollector> StatsDCollector::New (
IPAddress const& address, std::string const& prefix, Journal journal) IP::Endpoint const& address, std::string const& prefix, Journal journal)
{ {
return std::make_shared <detail::StatsDCollectorImp> ( return std::make_shared <detail::StatsDCollectorImp> (
address, prefix, journal); address, prefix, journal);

2
beast/net/impl/IPAddress.cpp
View File

@@ -389,7 +389,7 @@ public:
testParse <Endpoint> ("Parse Endpoint"); testParse <Endpoint> ("Parse Endpoint");
} }
IPAddressTests () : UnitTest ("IPAddress", "beast") IPAddressTests () : UnitTest ("IP::Endpoint", "beast")
{ {
} }
}; };

2
beast/net/impl/IPEndpoint.cpp
View File

@@ -17,6 +17,8 @@
*/ */
//============================================================================== //==============================================================================
#include "../detail/Parse.h"
namespace beast { namespace beast {
namespace IP { namespace IP {