From: Attila Molnar <attilamolnar@hush.com>
Date: Sat, 26 Jul 2014 13:51:28 +0000 (+0200)
Subject: m_spanningtree Replace #defines with references in DoCollision()
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=9028c48512367394af2f790b53658bc6a197f95e;p=user%2Fhenk%2Fcode%2Finspircd.git

m_spanningtree Replace #defines with references in DoCollision()
---

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 3b5944e9f..2e840c6b8 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -57,16 +57,14 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
 	bool bChangeLocal = true;
 	bool bChangeRemote = true;
 
-	/* for brevity, don't use the User - use defines to avoid any copy */
-	#define localts u->age
-	#define localident u->ident
-	#define localip u->GetIPString()
-
 	// If the timestamps are not equal only one of the users has to change nick,
 	// otherwise both have to change
+	const time_t localts = u->age;
 	if (remotets != localts)
 	{
 		/* first, let's see if ident@host matches. */
+		const std::string& localident = u->ident;
+		const std::string& localip = u->GetIPString();
 		bool SamePerson = (localident == remoteident)
 				&& (localip == remoteip);