From 3077892c3b654e084ae4c45edcce3145959e5f7b Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 1 Sep 2013 05:52:37 -0700 Subject: [PATCH] Remove deprecated basio::IoService --- Builds/VisualStudio2012/RippleD.vcxproj | 7 --- .../VisualStudio2012/RippleD.vcxproj.filters | 12 ----- modules/ripple_app/boost/ripple_IoService.cpp | 44 ------------------- modules/ripple_app/boost/ripple_IoService.h | 37 ---------------- modules/ripple_app/ripple_app.cpp | 3 -- 5 files changed, 103 deletions(-) delete mode 100644 modules/ripple_app/boost/ripple_IoService.cpp delete mode 100644 modules/ripple_app/boost/ripple_IoService.h diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj index 662a7b5567..f794f0c472 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj +++ b/Builds/VisualStudio2012/RippleD.vcxproj @@ -19,12 +19,6 @@ - - true - true - true - true - true true @@ -1358,7 +1352,6 @@ - diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters index 9d7031492d..1640566f54 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters @@ -136,9 +136,6 @@ {c69b07a2-44e5-4b06-99a9-81f5d137ea15} - - {8476f6e8-7411-460f-bdef-68e3166078eb} - {7c14e9df-6d8d-4ba3-b208-f89c1d0b6b30} @@ -798,9 +795,6 @@ [0] Subtrees\beast - - [1] Ripple\ripple_app\boost - [1] Ripple\ripple_app\websocket @@ -1565,9 +1559,6 @@ [1] Ripple\ripple_app\main - - [1] Ripple\ripple_app\boost - [1] Ripple\ripple_basics\utility @@ -1676,9 +1667,6 @@ [1] Ripple\ripple_net\basics\impl - - [1] Ripple\ripple_app\rpc - [1] Ripple\ripple_net\basics diff --git a/modules/ripple_app/boost/ripple_IoService.cpp b/modules/ripple_app/boost/ripple_IoService.cpp deleted file mode 100644 index ff71280882..0000000000 --- a/modules/ripple_app/boost/ripple_IoService.cpp +++ /dev/null @@ -1,44 +0,0 @@ -//------------------------------------------------------------------------------ -/* - Copyright (c) 2011-2013, OpenCoin, Inc. -*/ -//============================================================================== - -namespace basio -{ - -IoService* IoService::New (std::size_t concurrency_hint) -{ - return new IoService (concurrency_hint); -} - -IoService::~IoService () -{ -} - -IoService::operator boost::asio::io_service& () -{ - return *m_impl; -} - -IoService::IoService (std::size_t concurrency_hint) - : m_impl (new boost::asio::io_service (concurrency_hint)) -{ -} - -void IoService::stop () -{ - m_impl->stop (); -} - -bool IoService::stopped () -{ - return m_impl->stopped (); -} - -void IoService::run () -{ - m_impl->run (); -} - -} diff --git a/modules/ripple_app/boost/ripple_IoService.h b/modules/ripple_app/boost/ripple_IoService.h deleted file mode 100644 index 6afe49384a..0000000000 --- a/modules/ripple_app/boost/ripple_IoService.h +++ /dev/null @@ -1,37 +0,0 @@ -//------------------------------------------------------------------------------ -/* - Copyright (c) 2011-2013, OpenCoin, Inc. -*/ -//============================================================================== - -#ifndef RIPPLE_IOSERVICE_H_INCLUDED -#define RIPPLE_IOSERVICE_H_INCLUDED - -namespace basio -{ - -/** Hides a boost::asio::ioservice implementation. -*/ -class IoService -{ -public: - static IoService* New (std::size_t concurrency_hint); - - virtual ~IoService (); - - operator boost::asio::io_service& (); - - void stop (); - bool stopped (); - void run (); - -private: - explicit IoService (std::size_t concurrency_hint); - -private: - beast::ScopedPointer m_impl; -}; - -} - -#endif diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp index ce902f413b..bc430e2bc4 100644 --- a/modules/ripple_app/ripple_app.cpp +++ b/modules/ripple_app/ripple_app.cpp @@ -26,9 +26,6 @@ namespace ripple // Application // -# include "boost/ripple_IoService.h" // deprecated -#include "boost/ripple_IoService.cpp" // deprecated - # include "main/ripple_FatalErrorReporter.h" #include "main/ripple_FatalErrorReporter.cpp"