diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index db771305b..2819f25f1 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -1157,9 +1157,6 @@
true
true
-
- true
-
true
true
@@ -2517,7 +2514,6 @@
-
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 403e43f4c..f4d87bced 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -1371,9 +1371,6 @@
[2] Old Ripple\ripple_app\main
-
- [2] Old Ripple\ripple_app\peers
-
[2] Old Ripple\ripple_app\shamap
@@ -2844,9 +2841,6 @@
[2] Old Ripple\ripple_app\main
-
- [2] Old Ripple\ripple_app\peers
-
[2] Old Ripple\ripple_app\shamap
diff --git a/src/beast/Builds/VisualStudio2013/beast.vcxproj b/src/beast/Builds/VisualStudio2013/beast.vcxproj
index f883a8a23..95c59990f 100644
--- a/src/beast/Builds/VisualStudio2013/beast.vcxproj
+++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj
@@ -657,6 +657,12 @@
true
+
+ true
+ true
+ true
+ true
+
true
true
diff --git a/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters b/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters
index 36c5a3064..62d93d70e 100644
--- a/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters
+++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters
@@ -1844,6 +1844,9 @@
beast\net\impl
+
+ beast\utility\impl
+
diff --git a/src/beast/beast/config/CompilerConfig.h b/src/beast/beast/config/CompilerConfig.h
index 217df6040..6b42d3027 100644
--- a/src/beast/beast/config/CompilerConfig.h
+++ b/src/beast/beast/config/CompilerConfig.h
@@ -30,6 +30,8 @@
#error "PlatformConfig.h must come first!"
#endif
+#include
+
// This file defines miscellaneous macros for debugging, assertions, etc.
#if BEAST_FORCE_DEBUG
@@ -109,6 +111,7 @@ extern void beast_reportFatalError (char const* message, char const* fileName, i
*/
#define BDBG(dbgtext) { beast::String tempDbgBuf; tempDbgBuf << dbgtext; beast::Logger::outputDebugString (tempDbgBuf); }
+#if 0
/** This will always cause an assertion failure.
It is only compiled in a debug build, (unless BEAST_LOG_ASSERTIONS is enabled for your build).
@see bassert
@@ -122,6 +125,11 @@ extern void beast_reportFatalError (char const* message, char const* fileName, i
@see bassertfalse
*/
#define bassert(expression) { if (! (expression)) beast_reportFatalError(#expression,__FILE__,__LINE__); }
+#else
+
+#define bassertfalse assert(false)
+#define bassert(expression) assert(expression)
+#endif
#else
diff --git a/src/beast/beast/crypto/UnsignedIntegerCalc.h b/src/beast/beast/crypto/UnsignedIntegerCalc.h
index de3ea63d7..fffadfab7 100644
--- a/src/beast/beast/crypto/UnsignedIntegerCalc.h
+++ b/src/beast/beast/crypto/UnsignedIntegerCalc.h
@@ -334,7 +334,7 @@ public:
}
*lhs++ = UInt (part);
}
- bassert (carry == 0) // overflow
+ bassert (carry == 0); // overflow
return *this;
}
diff --git a/src/beast/beast/utility/Utility.cpp b/src/beast/beast/utility/Utility.cpp
index e2b254bfd..baeef8681 100644
--- a/src/beast/beast/utility/Utility.cpp
+++ b/src/beast/beast/utility/Utility.cpp
@@ -24,6 +24,7 @@
// For Journal and Debug
#include "../../modules/beast_core/beast_core.h"
+#include "impl/Assert.cpp"
#include "impl/Debug.cpp"
#include "impl/Journal.cpp"
#include "impl/LeakChecked.cpp"
diff --git a/src/beast/beast/utility/impl/Assert.cpp b/src/beast/beast/utility/impl/Assert.cpp
new file mode 100644
index 000000000..d7503cc21
--- /dev/null
+++ b/src/beast/beast/utility/impl/Assert.cpp
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+/*
+ This file is part of Beast: https://github.com/vinniefalco/Beast
+ Copyright 2013, Vinnie Falco
+
+ 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.
+*/
+//==============================================================================
+
+namespace beast {
+
+class BassertUnitTests : public UnitTest
+{
+public:
+ void runTest ()
+ {
+ beginTestCase ("bassert");
+ bassert (false);
+ }
+
+ BassertUnitTests () : UnitTest ("bassert", "beast", runManual) { }
+};
+
+//------------------------------------------------------------------------------
+
+static BassertUnitTests bassertUnitTests;
+}
diff --git a/src/beast/modules/beast_core/diagnostic/UnitTest.cpp b/src/beast/modules/beast_core/diagnostic/UnitTest.cpp
index 324dd4e37..94d74f5d2 100644
--- a/src/beast/modules/beast_core/diagnostic/UnitTest.cpp
+++ b/src/beast/modules/beast_core/diagnostic/UnitTest.cpp
@@ -393,7 +393,7 @@ void UnitTests::runTests (TestList const& tests, int64 randomSeed)
void UnitTests::onFailure ()
{
// A failure occurred and the setting to assert on failures is turned on.
- bassert (! m_assertOnFailure)
+ bassert (! m_assertOnFailure);
}
bool UnitTests::shouldAbortTests()
diff --git a/src/beast/modules/beast_core/xml/XmlElement.cpp b/src/beast/modules/beast_core/xml/XmlElement.cpp
index 748707508..cfa5de5a2 100644
--- a/src/beast/modules/beast_core/xml/XmlElement.cpp
+++ b/src/beast/modules/beast_core/xml/XmlElement.cpp
@@ -47,7 +47,7 @@ XmlElement::XmlElement (const String& tag) noexcept
: tagName (tag)
{
// the tag name mustn't be empty, or it'll look like a text element!
- bassert (tag.containsNonWhitespaceChars())
+ bassert (tag.containsNonWhitespaceChars());
// The tag can't contain spaces or other characters that would create invalid XML!
bassert (! tag.containsAnyOf (" <>/&"));