summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-11-14 18:19:33 -0800
committerGrant Limberg <glimberg@gmail.com>2015-11-14 18:19:33 -0800
commit75f8ee1b9c25403b7fbd42b901d98ddbce7f89f5 (patch)
tree35b527932209b36b35611ae742fb57dd39a4405d
parent0508a41afddce1b81921a0eeb9e03f28d0f04742 (diff)
downloadinfinitytier-75f8ee1b9c25403b7fbd42b901d98ddbce7f89f5.tar.gz
infinitytier-75f8ee1b9c25403b7fbd42b901d98ddbce7f89f5.zip
get the compiler to stop complaining about two string literals (one a macro) next to each other without an intervening space

-rw-r--r--node/Topology.cpp4
-rw-r--r--node/Topology.hpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/node/Topology.cpp b/node/Topology.cpp
index 1617dd94..3d1db337 100644
--- a/node/Topology.cpp
+++ b/node/Topology.cpp
@@ -128,8 +128,8 @@ SharedPtr<Peer> Topology::addPeer(const SharedPtr<Peer> &peer)
#ifdef ZT_TRACE
if ((!peer)||(peer->address() == RR->identity.address())) {
if (!peer)
- fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add NULL peer"ZT_EOL_S);
- else fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add peer for self"ZT_EOL_S);
+ fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add NULL peer" ZT_EOL_S);
+ else fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add peer for self" ZT_EOL_S);
abort();
}
#endif
diff --git a/node/Topology.hpp b/node/Topology.hpp
index a9a5f2f9..07daa276 100644
--- a/node/Topology.hpp
+++ b/node/Topology.hpp
@@ -239,7 +239,7 @@ public:
while (i.next(a,p)) {
#ifdef ZT_TRACE
if (!(*p)) {
- fprintf(stderr,"FATAL BUG: eachPeer() caught NULL peer for %s -- peer pointers in Topology should NEVER be NULL"ZT_EOL_S,a->toString().c_str());
+ fprintf(stderr,"FATAL BUG: eachPeer() caught NULL peer for %s -- peer pointers in Topology should NEVER be NULL" ZT_EOL_S,a->toString().c_str());
abort();
}
#endif