diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index 4e9d4be326..90ed293e97 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -126,6 +126,8 @@
+
+
@@ -302,14 +304,14 @@
True
+
+ True
+
True
-
- True
-
True
@@ -823,6 +825,14 @@
+
+
+
+
+
+
+
+
True
@@ -835,14 +845,6 @@
-
-
-
-
-
-
-
-
True
@@ -1185,8 +1187,6 @@
-
-
True
@@ -3515,18 +3515,10 @@
-
-
-
-
-
-
-
-
@@ -3577,6 +3569,12 @@
+
+
+
+
+
+
True
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 8732e7b063..7bc1834bbc 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -538,9 +538,6 @@
{B23DCD4C-1622-2C31-4562-87F2F95D3884}
-
- {C6115F8D-9E7F-833E-F8A9-D8FA61356CE7}
-
{3D1F0CBE-9B69-D29E-EAAE-E5A1204068BC}
@@ -663,6 +660,9 @@
build\proto
+
+ .
+
beast
@@ -894,15 +894,15 @@
beast\crypto\impl
+
+ beast\crypto\impl
+
beast\crypto\impl\sha2
beast\crypto\impl\sha2
-
- beast\crypto\impl
-
beast\crypto\impl
@@ -1545,6 +1545,18 @@
beast\module\core\text
+
+ beast\module\core\threads
+
+
+ beast\module\core\threads
+
+
+ beast\module\core\threads
+
+
+ beast\module\core\threads
+
beast\module\core\thread
@@ -1560,18 +1572,6 @@
beast\module\core\thread
-
- beast\module\core\threads
-
-
- beast\module\core\threads
-
-
- beast\module\core\threads
-
-
- beast\module\core\threads
-
beast\module\core\time
@@ -2010,9 +2010,6 @@
beast
-
- .
-
hyperleveldb\db
@@ -4863,24 +4860,12 @@
ripple\unity
-
- ripple\unity
-
ripple\unity
ripple\unity
-
- ripple\validators\api
-
-
- ripple\validators\api
-
-
- ripple\validators\api
-
ripple\validators\impl
@@ -4944,6 +4929,15 @@
ripple\validators\impl
+
+ ripple\validators
+
+
+ ripple\validators
+
+
+ ripple\validators
+
rocksdb\db
diff --git a/src/ripple/module/app/ledger/LedgerMaster.cpp b/src/ripple/module/app/ledger/LedgerMaster.cpp
index dc4f1efe25..121700abf5 100644
--- a/src/ripple/module/app/ledger/LedgerMaster.cpp
+++ b/src/ripple/module/app/ledger/LedgerMaster.cpp
@@ -18,6 +18,7 @@
//==============================================================================
#include
+#include
#include
namespace ripple {
diff --git a/src/ripple/module/app/main/Application.cpp b/src/ripple/module/app/main/Application.cpp
index 45d8c51eca..1f06e125e4 100644
--- a/src/ripple/module/app/main/Application.cpp
+++ b/src/ripple/module/app/main/Application.cpp
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
namespace ripple {
diff --git a/src/ripple/overlay/impl/PeerImp.h b/src/ripple/overlay/impl/PeerImp.h
index 107fca09f3..966cb67fb7 100644
--- a/src/ripple/overlay/impl/PeerImp.h
+++ b/src/ripple/overlay/impl/PeerImp.h
@@ -30,8 +30,8 @@
#include
#include
#include
-#include
#include
+#include
// VFALCO This is unfortunate. Comment this out and
// just include what is needed.
diff --git a/src/ripple/types/api/CryptoIdentifier.h b/src/ripple/types/api/CryptoIdentifier.h
index 59d2dde804..ab254047bf 100644
--- a/src/ripple/types/api/CryptoIdentifier.h
+++ b/src/ripple/types/api/CryptoIdentifier.h
@@ -91,7 +91,7 @@ public:
template
static value_type createFromInteger (UnsignedIntegralType i)
{
- static_bassert (size >= sizeof (UnsignedIntegralType));
+ static_assert (size >= sizeof (UnsignedIntegralType), "");
std::array data;
data.fill (0);
i = beast::toNetworkByteOrder (i);
diff --git a/src/ripple/types/api/RippleLedgerHash.h b/src/ripple/types/api/RippleLedgerHash.h
index 93868ae761..35dda2b5e5 100644
--- a/src/ripple/types/api/RippleLedgerHash.h
+++ b/src/ripple/types/api/RippleLedgerHash.h
@@ -20,6 +20,8 @@
#ifndef RIPPLE_TYPES_RIPPLELEDGERHASH_H_INCLUDED
#define RIPPLE_TYPES_RIPPLELEDGERHASH_H_INCLUDED
+#include
+
namespace ripple {
/*
diff --git a/src/ripple/types/api/SimpleIdentifier.h b/src/ripple/types/api/SimpleIdentifier.h
index 84d81650dd..f5243bd39e 100644
--- a/src/ripple/types/api/SimpleIdentifier.h
+++ b/src/ripple/types/api/SimpleIdentifier.h
@@ -20,6 +20,8 @@
#ifndef RIPPLE_TYPES_SIMPLEIDENTIFIER_H_INCLUDED
#define RIPPLE_TYPES_SIMPLEIDENTIFIER_H_INCLUDED
+#include
+
namespace ripple {
/** Provides common traits for non-signing identifiers like ledger hashes.
diff --git a/src/ripple/unity/app.cpp b/src/ripple/unity/app.cpp
index f6928ae9ee..f0139c1251 100644
--- a/src/ripple/unity/app.cpp
+++ b/src/ripple/unity/app.cpp
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
diff --git a/src/ripple/unity/app1.cpp b/src/ripple/unity/app1.cpp
index 27e29bcb84..eaf1521275 100644
--- a/src/ripple/unity/app1.cpp
+++ b/src/ripple/unity/app1.cpp
@@ -25,8 +25,6 @@
#include
-#include
-
#include
#include
diff --git a/src/ripple/unity/app5.cpp b/src/ripple/unity/app5.cpp
index 27c674026f..72397df4da 100644
--- a/src/ripple/unity/app5.cpp
+++ b/src/ripple/unity/app5.cpp
@@ -26,7 +26,6 @@
#include
#include
#include
-#include
#include
#include
diff --git a/src/ripple/unity/validators.cpp b/src/ripple/unity/validators.cpp
index 5b687f9931..65fb84397a 100644
--- a/src/ripple/unity/validators.cpp
+++ b/src/ripple/unity/validators.cpp
@@ -19,6 +19,7 @@
#include
+#if 0
#include
#include
@@ -47,6 +48,7 @@
#include
#include
#include
+#endif
#include
#include
@@ -56,3 +58,5 @@
#include
#include
#include
+
+//#include
diff --git a/src/ripple/unity/validators.h b/src/ripple/unity/validators.h
deleted file mode 100644
index ba9f06a669..0000000000
--- a/src/ripple/unity/validators.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//------------------------------------------------------------------------------
-/*
- This file is part of rippled: https://github.com/ripple/rippled
- Copyright (c) 2012, 2013 Ripple Labs Inc.
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_VALIDATORS_H_INCLUDED
-#define RIPPLE_VALIDATORS_H_INCLUDED
-
-#include
-
-#include
-
-#include
-#include
-#include
-
-#endif
diff --git a/src/ripple/validators/api/Manager.h b/src/ripple/validators/Manager.h
similarity index 96%
rename from src/ripple/validators/api/Manager.h
rename to src/ripple/validators/Manager.h
index d4c1b4120c..16e7004fa2 100644
--- a/src/ripple/validators/api/Manager.h
+++ b/src/ripple/validators/Manager.h
@@ -20,8 +20,12 @@
#ifndef RIPPLE_VALIDATORS_MANAGER_H_INCLUDED
#define RIPPLE_VALIDATORS_MANAGER_H_INCLUDED
+#include
+#include
#include
+#include
#include
+#include
namespace ripple {
namespace Validators {
diff --git a/src/ripple/validators/api/Source.h b/src/ripple/validators/Source.h
similarity index 97%
rename from src/ripple/validators/api/Source.h
rename to src/ripple/validators/Source.h
index 4ece355608..ca93db0697 100644
--- a/src/ripple/validators/api/Source.h
+++ b/src/ripple/validators/Source.h
@@ -20,8 +20,10 @@
#ifndef RIPPLE_VALIDATORS_SOURCE_H_INCLUDED
#define RIPPLE_VALIDATORS_SOURCE_H_INCLUDED
+#include
#include
#include
+#include
namespace ripple {
namespace Validators {
diff --git a/src/ripple/validators/TODO.md b/src/ripple/validators/TODO.md
deleted file mode 100644
index c7f28ca76b..0000000000
--- a/src/ripple/validators/TODO.md
+++ /dev/null
@@ -1 +0,0 @@
-# Validators TODO
diff --git a/src/ripple/validators/api/Types.h b/src/ripple/validators/Types.h
similarity index 96%
rename from src/ripple/validators/api/Types.h
rename to src/ripple/validators/Types.h
index 99e03cf43b..a0a8fa7a9b 100644
--- a/src/ripple/validators/api/Types.h
+++ b/src/ripple/validators/Types.h
@@ -20,6 +20,8 @@
#ifndef RIPPLE_VALIDATORS_TYPES_H_INCLUDED
#define RIPPLE_VALIDATORS_TYPES_H_INCLUDED
+#include
+
namespace ripple {
namespace Validators {
diff --git a/src/ripple/validators/impl/ChosenList.h b/src/ripple/validators/impl/ChosenList.h
index 2de6bd0a0c..c07dd441a6 100644
--- a/src/ripple/validators/impl/ChosenList.h
+++ b/src/ripple/validators/impl/ChosenList.h
@@ -21,6 +21,7 @@
#define RIPPLE_VALIDATORS_CHOSENLIST_H_INCLUDED
#include
+#include
namespace ripple {
namespace Validators {
diff --git a/src/ripple/validators/impl/Logic.h b/src/ripple/validators/impl/Logic.h
index 4bbe938fc7..a7b92f2083 100644
--- a/src/ripple/validators/impl/Logic.h
+++ b/src/ripple/validators/impl/Logic.h
@@ -20,8 +20,14 @@
#ifndef RIPPLE_VALIDATORS_LOGIC_H_INCLUDED
#define RIPPLE_VALIDATORS_LOGIC_H_INCLUDED
+#include
+#include
+#include
+#include
+#include
#include
#include
+#include
#include
namespace ripple {
diff --git a/src/ripple/validators/impl/Manager.cpp b/src/ripple/validators/impl/Manager.cpp
index 666e9e7150..bbd42f21b1 100644
--- a/src/ripple/validators/impl/Manager.cpp
+++ b/src/ripple/validators/impl/Manager.cpp
@@ -17,6 +17,17 @@
*/
//==============================================================================
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
/** ChosenValidators (formerly known as UNL)
Motivation:
diff --git a/src/ripple/validators/impl/SourceDesc.h b/src/ripple/validators/impl/SourceDesc.h
index c13c54ef62..67b2c723d3 100644
--- a/src/ripple/validators/impl/SourceDesc.h
+++ b/src/ripple/validators/impl/SourceDesc.h
@@ -20,6 +20,8 @@
#ifndef RIPPLE_VALIDATORS_SOURCEDESC_H_INCLUDED
#define RIPPLE_VALIDATORS_SOURCEDESC_H_INCLUDED
+#include
+
namespace ripple {
namespace Validators {
diff --git a/src/ripple/validators/impl/SourceFile.cpp b/src/ripple/validators/impl/SourceFile.cpp
index b479a8b053..07253573ab 100644
--- a/src/ripple/validators/impl/SourceFile.cpp
+++ b/src/ripple/validators/impl/SourceFile.cpp
@@ -17,6 +17,9 @@
*/
//==============================================================================
+#include
+#include
+
namespace ripple {
namespace Validators {
diff --git a/src/ripple/validators/impl/SourceURL.cpp b/src/ripple/validators/impl/SourceURL.cpp
index f336966a5c..407dd91704 100644
--- a/src/ripple/validators/impl/SourceURL.cpp
+++ b/src/ripple/validators/impl/SourceURL.cpp
@@ -17,6 +17,7 @@
*/
//==============================================================================
+#include
#include
namespace ripple {
diff --git a/src/ripple/validators/impl/Store.h b/src/ripple/validators/impl/Store.h
index 0c7b391ff0..453d1e0d01 100644
--- a/src/ripple/validators/impl/Store.h
+++ b/src/ripple/validators/impl/Store.h
@@ -20,6 +20,8 @@
#ifndef RIPPLE_VALIDATORS_STORE_H_INCLUDED
#define RIPPLE_VALIDATORS_STORE_H_INCLUDED
+#include
+
namespace ripple {
namespace Validators {
diff --git a/src/ripple/validators/impl/StoreSqdb.h b/src/ripple/validators/impl/StoreSqdb.h
index ff6f1881fb..03321af851 100644
--- a/src/ripple/validators/impl/StoreSqdb.h
+++ b/src/ripple/validators/impl/StoreSqdb.h
@@ -20,6 +20,10 @@
#ifndef RIPPLE_VALIDATORS_STORESQDB_H_INCLUDED
#define RIPPLE_VALIDATORS_STORESQDB_H_INCLUDED
+#include
+#include
+#include
+
namespace ripple {
namespace Validators {
diff --git a/src/ripple/validators/impl/Tests.cpp b/src/ripple/validators/impl/Tests.cpp
index a5ab9b5bec..94ec6bd0be 100644
--- a/src/ripple/validators/impl/Tests.cpp
+++ b/src/ripple/validators/impl/Tests.cpp
@@ -33,70 +33,6 @@ public:
//--------------------------------------------------------------------------
- struct Payload
- {
- Payload ()
- {
- }
- };
-
- template
- class PeerLogic : public TestOverlay::PeerLogicBase
- {
- public:
- typedef TestOverlay::PeerLogicBase Base;
- typedef typename Config::Payload Payload;
- typedef typename Base::Connection Connection;
- typedef typename Base::Peer Peer;
- typedef typename Base::Message Message;
- typedef typename Config::SizeType SizeType;
-
- explicit PeerLogic (Peer& peer)
- : TestOverlay::PeerLogicBase (peer)
- {
- }
-
- ~PeerLogic ()
- {
- }
-
- void step ()
- {
- if (this->peer().id () == 1)
- {
- if (this->peer().network().steps() == 0)
- {
- this->peer().network().state().increment();
- this->peer().send_all (Payload (1));
- }
- }
- }
-
- void receive (Connection const& c, Message const& m)
- {
- if (this->peer().id () != 1)
- {
- this->peer().network().state().increment();
- this->peer().send_all_if (Message (m.id(),
- m.payload().withHop ()),
- typename Connection::IsNotPeer (c.peer()));
- }
- }
- };
-
- struct Params : TestOverlay::ConfigType <
- Params,
- TestOverlay::StateBase,
- PeerLogic
- >
- {
- typedef TestOverlay::PremadeInitPolicy <250, 3> InitPolicy;
- };
-
- typedef Params::Network Network;
-
- //--------------------------------------------------------------------------
-
struct TestSource : Source
{
TestSource (beast::String const& name, std::uint32_t start, std::uint32_t end)
diff --git a/src/ripple/validators/impl/Utilities.cpp b/src/ripple/validators/impl/Utilities.cpp
index e2416dfe52..dc6c8eb8ce 100644
--- a/src/ripple/validators/impl/Utilities.cpp
+++ b/src/ripple/validators/impl/Utilities.cpp
@@ -17,6 +17,8 @@
*/
//==============================================================================
+#include
+
namespace ripple {
namespace Validators {
diff --git a/src/ripple/validators/impl/Validator.h b/src/ripple/validators/impl/Validator.h
index 8bb0399f6a..6d3c59db5d 100644
--- a/src/ripple/validators/impl/Validator.h
+++ b/src/ripple/validators/impl/Validator.h
@@ -20,7 +20,8 @@
#ifndef RIPPLE_VALIDATORS_VALIDATOR_H_INCLUDED
#define RIPPLE_VALIDATORS_VALIDATOR_H_INCLUDED
-#include
+#include // VFALCO Doesn't belong here
+#include
#include
#include
#include