diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index f0cbd65f55..eac472d486 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -1781,6 +1781,83 @@ + + True + + + + + + + True + + + + + True + + + + + True + + + + + + + True + + + + + + + + + True + + + + + + + True + + + + + True + + + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + @@ -2453,83 +2530,6 @@ - - True - - - - - - - True - - - - - True - - - - - True - - - - - - - True - - - - - - - - - True - - - - - - - True - - - - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - True diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index e66ff772a7..08c08a2c1b 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -304,6 +304,24 @@ {D3D1BF8B-B98E-EA13-7D8C-F0C3243E99F5} + + {B8720E2F-21B1-2847-F96C-4E00A45DC639} + + + {2F620E10-3275-8530-CE66-F28EDCDF96CD} + + + {993B768B-5F1D-066B-0C4E-B567A82ED0E5} + + + {290E79AD-FABB-AC30-3C05-3F6DE4827C28} + + + {E7D662E4-22C4-15C5-0AE6-C3AACA919EAC} + + + {8C4A62F0-54D0-6DE8-292F-EB5C13E1AFBD} + {386F7193-3E90-1C28-75BE-5AE6461046C7} @@ -388,24 +406,6 @@ {611381EF-CB49-47DB-5552-F00357947B07} - - {14BC6FC5-AD61-C77A-38D2-64A4E0DD3388} - - - {F2C1F13E-B331-AF79-189B-5BEE793D7810} - - - {BEE9B408-B0F4-C294-4D46-1489E5CB734E} - - - {5000F704-7AAD-07B5-6D3E-A6CDD897A6F4} - - - {5D510DC9-EB36-CE1B-F37D-95BC62BA87A3} - - - {6735BBF1-7E71-05A6-D735-996F3CF2AE8C} - {4DAFFAEC-2D9A-42C0-210F-483796C162E9} @@ -2721,6 +2721,102 @@ ripple\algorithm\api + + ripple\basics\containers + + + ripple\basics\containers + + + ripple\basics\containers + + + ripple\basics\log + + + ripple\basics\log + + + ripple\basics\log + + + ripple\basics\log + + + ripple\basics\log + + + ripple\basics\log + + + ripple\basics\log + + + ripple\basics\log + + + ripple\basics\log + + + ripple\basics\log + + + ripple\basics\system + + + ripple\basics\system + + + ripple\basics\system + + + ripple\basics\types + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + + + ripple\basics\utility + ripple\common @@ -3537,102 +3633,6 @@ ripple\module\app\websocket - - ripple\module\basics\containers - - - ripple\module\basics\containers - - - ripple\module\basics\containers - - - ripple\module\basics\log - - - ripple\module\basics\log - - - ripple\module\basics\log - - - ripple\module\basics\log - - - ripple\module\basics\log - - - ripple\module\basics\log - - - ripple\module\basics\log - - - ripple\module\basics\log - - - ripple\module\basics\log - - - ripple\module\basics\log - - - ripple\module\basics\system - - - ripple\module\basics\system - - - ripple\module\basics\system - - - ripple\module\basics\types - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - - - ripple\module\basics\utility - ripple\module\core\functional diff --git a/src/ripple/module/basics/containers/RangeSet.cpp b/src/ripple/basics/containers/RangeSet.cpp similarity index 98% rename from src/ripple/module/basics/containers/RangeSet.cpp rename to src/ripple/basics/containers/RangeSet.cpp index beb1a67e0a..281aff594d 100644 --- a/src/ripple/module/basics/containers/RangeSet.cpp +++ b/src/ripple/basics/containers/RangeSet.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/module/basics/containers/RangeSet.h b/src/ripple/basics/containers/RangeSet.h similarity index 100% rename from src/ripple/module/basics/containers/RangeSet.h rename to src/ripple/basics/containers/RangeSet.h diff --git a/src/ripple/module/basics/containers/SyncUnorderedMap.h b/src/ripple/basics/containers/SyncUnorderedMap.h similarity index 100% rename from src/ripple/module/basics/containers/SyncUnorderedMap.h rename to src/ripple/basics/containers/SyncUnorderedMap.h diff --git a/src/ripple/module/basics/log/Log.cpp b/src/ripple/basics/log/Log.cpp similarity index 100% rename from src/ripple/module/basics/log/Log.cpp rename to src/ripple/basics/log/Log.cpp diff --git a/src/ripple/module/basics/log/Log.h b/src/ripple/basics/log/Log.h similarity index 94% rename from src/ripple/module/basics/log/Log.h rename to src/ripple/basics/log/Log.h index ce016beaa1..6bcae46822 100644 --- a/src/ripple/module/basics/log/Log.h +++ b/src/ripple/basics/log/Log.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_BASICS_LOG_H_INCLUDED #define RIPPLE_BASICS_LOG_H_INCLUDED -#include -#include -#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/module/basics/log/LogFile.cpp b/src/ripple/basics/log/LogFile.cpp similarity index 100% rename from src/ripple/module/basics/log/LogFile.cpp rename to src/ripple/basics/log/LogFile.cpp diff --git a/src/ripple/module/basics/log/LogFile.h b/src/ripple/basics/log/LogFile.h similarity index 100% rename from src/ripple/module/basics/log/LogFile.h rename to src/ripple/basics/log/LogFile.h diff --git a/src/ripple/module/basics/log/LogPartition.cpp b/src/ripple/basics/log/LogPartition.cpp similarity index 100% rename from src/ripple/module/basics/log/LogPartition.cpp rename to src/ripple/basics/log/LogPartition.cpp diff --git a/src/ripple/module/basics/log/LogPartition.h b/src/ripple/basics/log/LogPartition.h similarity index 99% rename from src/ripple/module/basics/log/LogPartition.h rename to src/ripple/basics/log/LogPartition.h index 46f4a87382..ac7bf4ce3f 100644 --- a/src/ripple/module/basics/log/LogPartition.h +++ b/src/ripple/basics/log/LogPartition.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_LOGPARTITION_H_INCLUDED #define RIPPLE_BASICS_LOGPARTITION_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/module/basics/log/LogSeverity.h b/src/ripple/basics/log/LogSeverity.h similarity index 100% rename from src/ripple/module/basics/log/LogSeverity.h rename to src/ripple/basics/log/LogSeverity.h diff --git a/src/ripple/module/basics/log/LogSink.cpp b/src/ripple/basics/log/LogSink.cpp similarity index 100% rename from src/ripple/module/basics/log/LogSink.cpp rename to src/ripple/basics/log/LogSink.cpp diff --git a/src/ripple/module/basics/log/LogSink.h b/src/ripple/basics/log/LogSink.h similarity index 98% rename from src/ripple/module/basics/log/LogSink.h rename to src/ripple/basics/log/LogSink.h index da99d45058..9cd172459e 100644 --- a/src/ripple/module/basics/log/LogSink.h +++ b/src/ripple/basics/log/LogSink.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_LOGSINK_H_INCLUDED #define RIPPLE_BASICS_LOGSINK_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/module/basics/log/LoggedTimings.h b/src/ripple/basics/log/LoggedTimings.h similarity index 98% rename from src/ripple/module/basics/log/LoggedTimings.h rename to src/ripple/basics/log/LoggedTimings.h index 9eb62e0104..5747c9da91 100644 --- a/src/ripple/module/basics/log/LoggedTimings.h +++ b/src/ripple/basics/log/LoggedTimings.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace ripple { diff --git a/src/ripple/module/basics/system/BoostIncludes.h b/src/ripple/basics/system/BoostIncludes.h similarity index 100% rename from src/ripple/module/basics/system/BoostIncludes.h rename to src/ripple/basics/system/BoostIncludes.h diff --git a/src/ripple/module/basics/system/CheckLibraryVersions.cpp b/src/ripple/basics/system/CheckLibraryVersions.cpp similarity index 98% rename from src/ripple/module/basics/system/CheckLibraryVersions.cpp rename to src/ripple/basics/system/CheckLibraryVersions.cpp index 7e93ee2002..aef9096c4a 100644 --- a/src/ripple/module/basics/system/CheckLibraryVersions.cpp +++ b/src/ripple/basics/system/CheckLibraryVersions.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace ripple { namespace version { diff --git a/src/ripple/module/basics/system/CheckLibraryVersions.h b/src/ripple/basics/system/CheckLibraryVersions.h similarity index 100% rename from src/ripple/module/basics/system/CheckLibraryVersions.h rename to src/ripple/basics/system/CheckLibraryVersions.h diff --git a/src/ripple/module/basics/types/BasicTypes.h b/src/ripple/basics/types/BasicTypes.h similarity index 100% rename from src/ripple/module/basics/types/BasicTypes.h rename to src/ripple/basics/types/BasicTypes.h diff --git a/src/ripple/module/basics/utility/CountedObject.cpp b/src/ripple/basics/utility/CountedObject.cpp similarity index 97% rename from src/ripple/module/basics/utility/CountedObject.cpp rename to src/ripple/basics/utility/CountedObject.cpp index eb7fa1e2c1..0542bd2523 100644 --- a/src/ripple/module/basics/utility/CountedObject.cpp +++ b/src/ripple/basics/utility/CountedObject.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/basics/utility/CountedObject.h b/src/ripple/basics/utility/CountedObject.h similarity index 100% rename from src/ripple/module/basics/utility/CountedObject.h rename to src/ripple/basics/utility/CountedObject.h diff --git a/src/ripple/module/basics/utility/IniFile.cpp b/src/ripple/basics/utility/IniFile.cpp similarity index 99% rename from src/ripple/module/basics/utility/IniFile.cpp rename to src/ripple/basics/utility/IniFile.cpp index b4a49c166a..48df59cfed 100644 --- a/src/ripple/module/basics/utility/IniFile.cpp +++ b/src/ripple/basics/utility/IniFile.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/module/basics/utility/IniFile.h b/src/ripple/basics/utility/IniFile.h similarity index 100% rename from src/ripple/module/basics/utility/IniFile.h rename to src/ripple/basics/utility/IniFile.h diff --git a/src/ripple/module/basics/utility/PlatformMacros.h b/src/ripple/basics/utility/PlatformMacros.h similarity index 96% rename from src/ripple/module/basics/utility/PlatformMacros.h rename to src/ripple/basics/utility/PlatformMacros.h index dc0bf19891..90fe8f67f5 100644 --- a/src/ripple/module/basics/utility/PlatformMacros.h +++ b/src/ripple/basics/utility/PlatformMacros.h @@ -25,6 +25,10 @@ namespace ripple { +// +// VFALCO DEPRECATED, this should all be removed. +// + template inline std::enable_if_t< diff --git a/src/ripple/module/basics/utility/StringUtilities.cpp b/src/ripple/basics/utility/StringUtilities.cpp similarity index 99% rename from src/ripple/module/basics/utility/StringUtilities.cpp rename to src/ripple/basics/utility/StringUtilities.cpp index 7db6a094d1..054ea30c88 100644 --- a/src/ripple/module/basics/utility/StringUtilities.cpp +++ b/src/ripple/basics/utility/StringUtilities.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/module/basics/utility/StringUtilities.h b/src/ripple/basics/utility/StringUtilities.h similarity index 98% rename from src/ripple/module/basics/utility/StringUtilities.h rename to src/ripple/basics/utility/StringUtilities.h index 293fbc9e8a..370ed4cbd4 100644 --- a/src/ripple/module/basics/utility/StringUtilities.h +++ b/src/ripple/basics/utility/StringUtilities.h @@ -23,6 +23,8 @@ #include #include #include +#include +#include namespace ripple { diff --git a/src/ripple/module/basics/utility/Sustain.cpp b/src/ripple/basics/utility/Sustain.cpp similarity index 98% rename from src/ripple/module/basics/utility/Sustain.cpp rename to src/ripple/basics/utility/Sustain.cpp index c10163256a..6f57ce8e30 100644 --- a/src/ripple/module/basics/utility/Sustain.cpp +++ b/src/ripple/basics/utility/Sustain.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include // For Sustain Linux variants // VFALCO TODO Rewrite Sustain to use beast::Process diff --git a/src/ripple/module/basics/utility/Sustain.h b/src/ripple/basics/utility/Sustain.h similarity index 100% rename from src/ripple/module/basics/utility/Sustain.h rename to src/ripple/basics/utility/Sustain.h diff --git a/src/ripple/module/basics/utility/ThreadName.cpp b/src/ripple/basics/utility/ThreadName.cpp similarity index 100% rename from src/ripple/module/basics/utility/ThreadName.cpp rename to src/ripple/basics/utility/ThreadName.cpp diff --git a/src/ripple/module/basics/utility/ThreadName.h b/src/ripple/basics/utility/ThreadName.h similarity index 100% rename from src/ripple/module/basics/utility/ThreadName.h rename to src/ripple/basics/utility/ThreadName.h diff --git a/src/ripple/module/basics/utility/Time.cpp b/src/ripple/basics/utility/Time.cpp similarity index 100% rename from src/ripple/module/basics/utility/Time.cpp rename to src/ripple/basics/utility/Time.cpp diff --git a/src/ripple/module/basics/utility/Time.h b/src/ripple/basics/utility/Time.h similarity index 97% rename from src/ripple/module/basics/utility/Time.h rename to src/ripple/basics/utility/Time.h index a05e9f1ffe..9524f34d63 100644 --- a/src/ripple/module/basics/utility/Time.h +++ b/src/ripple/basics/utility/Time.h @@ -22,7 +22,6 @@ namespace ripple { -boost::posix_time::ptime ptEpoch (); int iToSeconds (boost::posix_time::ptime ptWhen); boost::posix_time::ptime ptFromSeconds (int iSeconds); uint64_t utFromSeconds (int iSeconds); diff --git a/src/ripple/module/basics/utility/UptimeTimer.cpp b/src/ripple/basics/utility/UptimeTimer.cpp similarity index 97% rename from src/ripple/module/basics/utility/UptimeTimer.cpp rename to src/ripple/basics/utility/UptimeTimer.cpp index 2f6ac79504..3e8aac8586 100644 --- a/src/ripple/module/basics/utility/UptimeTimer.cpp +++ b/src/ripple/basics/utility/UptimeTimer.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include namespace ripple { diff --git a/src/ripple/module/basics/utility/UptimeTimer.h b/src/ripple/basics/utility/UptimeTimer.h similarity index 100% rename from src/ripple/module/basics/utility/UptimeTimer.h rename to src/ripple/basics/utility/UptimeTimer.h diff --git a/src/ripple/module/app/book/Taker.h b/src/ripple/module/app/book/Taker.h index a75cd8f553..580472f451 100644 --- a/src/ripple/module/app/book/Taker.h +++ b/src/ripple/module/app/book/Taker.h @@ -44,10 +44,10 @@ public: explicit Options (std::uint32_t tx_flags) - : sell (is_bit_set (tx_flags, tfSell)) - , passive (is_bit_set (tx_flags, tfPassive)) - , fill_or_kill (is_bit_set (tx_flags, tfFillOrKill)) - , immediate_or_cancel (is_bit_set (tx_flags, tfImmediateOrCancel)) + : sell (tx_flags & tfSell) + , passive (tx_flags & tfPassive) + , fill_or_kill (tx_flags & tfFillOrKill) + , immediate_or_cancel (tx_flags & tfImmediateOrCancel) { } diff --git a/src/ripple/module/app/ledger/Ledger.cpp b/src/ripple/module/app/ledger/Ledger.cpp index 77d3939c25..0e53c37f24 100644 --- a/src/ripple/module/app/ledger/Ledger.cpp +++ b/src/ripple/module/app/ledger/Ledger.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include diff --git a/src/ripple/module/app/ledger/LedgerMaster.cpp b/src/ripple/module/app/ledger/LedgerMaster.cpp index 672cb993fe..97adf499aa 100644 --- a/src/ripple/module/app/ledger/LedgerMaster.cpp +++ b/src/ripple/module/app/ledger/LedgerMaster.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include namespace ripple { diff --git a/src/ripple/module/app/main/Application.cpp b/src/ripple/module/app/main/Application.cpp index 1c3742c3ed..647ddce7bf 100644 --- a/src/ripple/module/app/main/Application.cpp +++ b/src/ripple/module/app/main/Application.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include diff --git a/src/ripple/module/app/main/FatalErrorReporter.cpp b/src/ripple/module/app/main/FatalErrorReporter.cpp index 2d5bf2682d..4224b5bb4a 100644 --- a/src/ripple/module/app/main/FatalErrorReporter.cpp +++ b/src/ripple/module/app/main/FatalErrorReporter.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/module/app/main/Main.cpp b/src/ripple/module/app/main/Main.cpp index e537f5c8f0..801c3c0d56 100644 --- a/src/ripple/module/app/main/Main.cpp +++ b/src/ripple/module/app/main/Main.cpp @@ -17,9 +17,11 @@ */ //============================================================================== +#include +#include +#include #include #include -#include namespace po = boost::program_options; diff --git a/src/ripple/module/app/misc/NetworkOPs.cpp b/src/ripple/module/app/misc/NetworkOPs.cpp index 871a4ed4c3..7f499101fa 100644 --- a/src/ripple/module/app/misc/NetworkOPs.cpp +++ b/src/ripple/module/app/misc/NetworkOPs.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include +#include #include - +#include #include #include #include diff --git a/src/ripple/module/app/peers/UniqueNodeList.cpp b/src/ripple/module/app/peers/UniqueNodeList.cpp index 00b367ddbf..42ee7b5115 100644 --- a/src/ripple/module/app/peers/UniqueNodeList.cpp +++ b/src/ripple/module/app/peers/UniqueNodeList.cpp @@ -17,8 +17,9 @@ */ //============================================================================== +#include +#include #include - #include #include diff --git a/src/ripple/module/core/functional/Config.cpp b/src/ripple/module/core/functional/Config.cpp index 71f9c7c295..bbcc131c91 100644 --- a/src/ripple/module/core/functional/Config.cpp +++ b/src/ripple/module/core/functional/Config.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include namespace ripple { diff --git a/src/ripple/module/core/functional/Job.h b/src/ripple/module/core/functional/Job.h index b81ef39a56..f0141257e5 100644 --- a/src/ripple/module/core/functional/Job.h +++ b/src/ripple/module/core/functional/Job.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_JOB_H #define RIPPLE_JOB_H -#include +#include #include #include diff --git a/src/ripple/module/core/functional/LoadMonitor.cpp b/src/ripple/module/core/functional/LoadMonitor.cpp index 22d25f3c4d..7f84f661ab 100644 --- a/src/ripple/module/core/functional/LoadMonitor.cpp +++ b/src/ripple/module/core/functional/LoadMonitor.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { /* diff --git a/src/ripple/module/data/utility/UptimeTimerAdapter.h b/src/ripple/module/data/utility/UptimeTimerAdapter.h index 738b1bb410..07fd08d3db 100644 --- a/src/ripple/module/data/utility/UptimeTimerAdapter.h +++ b/src/ripple/module/data/utility/UptimeTimerAdapter.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_UPTIMETIMERADAPTER_H #define RIPPLE_UPTIMETIMERADAPTER_H +#include + namespace ripple { /** Adapter providing uptime measurements for template classes. */ diff --git a/src/ripple/nodestore/NodeObject.h b/src/ripple/nodestore/NodeObject.h index cb9f86dd65..0f33f64617 100644 --- a/src/ripple/nodestore/NodeObject.h +++ b/src/ripple/nodestore/NodeObject.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED #define RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED -#include +#include #include // VFALCO NOTE Intentionally not in the NodeStore namespace diff --git a/src/ripple/nodestore/impl/DatabaseImp.h b/src/ripple/nodestore/impl/DatabaseImp.h index a75f7f3ee1..705b2e4212 100644 --- a/src/ripple/nodestore/impl/DatabaseImp.h +++ b/src/ripple/nodestore/impl/DatabaseImp.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_DATABASEIMP_H_INCLUDED #define RIPPLE_NODESTORE_DATABASEIMP_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/unity/basics.cpp b/src/ripple/unity/basics.cpp index 11c20f8506..5a38d6de02 100644 --- a/src/ripple/unity/basics.cpp +++ b/src/ripple/unity/basics.cpp @@ -19,16 +19,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/basics.h b/src/ripple/unity/basics.h index e31967815f..def0e814f2 100644 --- a/src/ripple/unity/basics.h +++ b/src/ripple/unity/basics.h @@ -22,7 +22,7 @@ #include -#include +#include #include #include @@ -34,25 +34,16 @@ using beast::Zero; #include -#include +#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif