summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-12 17:49:37 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-12 17:49:37 +0100
commitef58b0eb54c700800597031c37c3e76fef87cdfb (patch)
tree03276194c5693d7da0d330b4427f18752be39a58
parentRollback submodule change (diff)
downloadcuberite-ef58b0eb54c700800597031c37c3e76fef87cdfb.tar
cuberite-ef58b0eb54c700800597031c37c3e76fef87cdfb.tar.gz
cuberite-ef58b0eb54c700800597031c37c3e76fef87cdfb.tar.bz2
cuberite-ef58b0eb54c700800597031c37c3e76fef87cdfb.tar.lz
cuberite-ef58b0eb54c700800597031c37c3e76fef87cdfb.tar.xz
cuberite-ef58b0eb54c700800597031c37c3e76fef87cdfb.tar.zst
cuberite-ef58b0eb54c700800597031c37c3e76fef87cdfb.zip
Diffstat (limited to '')
-rw-r--r--Tools/ProtoProxy/Connection.cpp4
-rw-r--r--src/Globals.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp
index 73688d310..46119ff42 100644
--- a/Tools/ProtoProxy/Connection.cpp
+++ b/Tools/ProtoProxy/Connection.cpp
@@ -2772,7 +2772,7 @@ void cConnection::LogMetadata(const AString & a_Metadata, size_t a_IndentCount)
{
int Index = ((unsigned)((unsigned char)a_Metadata[pos])) & 0x1f; // Lower 5 bits = index
int Type = ((unsigned)((unsigned char)a_Metadata[pos])) >> 5; // Upper 3 bits = type
- //int Length = 0;
+ // int Length = 0;
switch (Type)
{
case 0:
@@ -2827,7 +2827,7 @@ void cConnection::LogMetadata(const AString & a_Metadata, size_t a_IndentCount)
ASSERT(!"Cannot parse item description from metadata");
return;
}
- //int After = bb.GetReadableSpace();
+ // int After = bb.GetReadableSpace();
int BytesConsumed = BytesLeft - bb.GetReadableSpace();
Log("%sslot[%d] = %s (%d bytes)", Indent.c_str(), Index, ItemDesc.c_str(), BytesConsumed);
diff --git a/src/Globals.h b/src/Globals.h
index 2cd160677..6661aa476 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -236,7 +236,7 @@ template class SizeChecker<UInt16, 2>;
// Same as assert but in all Self test builds
#ifdef SELF_TEST
-#define assert_test(x) ( !!(x) || (assert(0), exit(1), 0))
+#define assert_test(x) ( !!(x) || (assert(!#x), exit(1), 0))
#endif
/// A generic interface used mainly in ForEach() functions