ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

General tidy and refactoring:

Browse Source 
* Use nullptr (C++11) instead of NULL.
* Put each file into its own namespace declaration.
* Remove "using namespace" directives and add scope qualifiers.
* Control when beast's implementation of std::equal (C++14) is used.
* Tidy up some const declarations.

Conflicts:
	src/ripple_app/shamap/SHAMapSync.cpp
	src/ripple_app/tx/TransactionEngine.cpp
This commit is contained in:
Howard Hinnant
2014-03-07 18:54:11 -05:00
committed by Vinnie Falco
parent c581ffb8a4
commit cad50c68a8
519 changed files with 3618 additions and 2726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ripple/sitefiles/impl/Manager.cpp
View File

@@ -20,23 +20,23 @@
namespace ripple {
namespace SiteFiles {
typedef ScopedWrapperContext <
RecursiveMutex, RecursiveMutex::ScopedLockType> SerializedContext;
typedef beast::ScopedWrapperContext <
beast::RecursiveMutex, beast::RecursiveMutex::ScopedLockType> SerializedContext;
class ManagerImp
: public Manager
, public Thread
, public DeadlineTimer::Listener
, public LeakChecked <ManagerImp>
, public beast::Thread
, public beast::DeadlineTimer::Listener
, public beast::LeakChecked <ManagerImp>
{
public:
Logic m_logic;
Journal m_journal;
ServiceQueue m_queue;
beast::Journal m_journal;
beast::ServiceQueue m_queue;
//--------------------------------------------------------------------------
ManagerImp (Stoppable& stoppable, Journal journal)
ManagerImp (Stoppable& stoppable, beast::Journal journal)
: Manager (stoppable)
, Thread ("SiteFiles")
, m_logic (journal)
@@ -101,7 +101,7 @@ public:
//
//--------------------------------------------------------------------------
void onWrite (PropertyStream::Map& map)
void onWrite (beast::PropertyStream::Map& map)
{
//SerializedContext::Scope scope (m_context);
@@ -110,7 +110,7 @@ public:
//--------------------------------------------------------------------------
void onDeadlineTimer (DeadlineTimer& timer)
void onDeadlineTimer (beast::DeadlineTimer& timer)
{
}
@@ -128,11 +128,11 @@ public:
Manager::Manager (Stoppable& parent)
: Stoppable ("PeerFinder", parent)
, PropertyStream::Source ("peerfinder")
, beast::PropertyStream::Source ("peerfinder")
{
}
Manager* Manager::New (Stoppable& parent, Journal journal)
Manager* Manager::New (Stoppable& parent, beast::Journal journal)
{
return new ManagerImp (parent, journal);
}