From 29694ce3d2c57ebefa9b14b6816679bf44799921 Mon Sep 17 00:00:00 2001
From: Adam
Date: Sun, 8 Sep 2013 04:00:00 -0400
Subject: Fix compile warnings as seen on g++ 4.4.7

---
 src/modules/m_spanningtree/commandbuilder.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/modules/m_spanningtree/commandbuilder.h')

diff --git a/src/modules/m_spanningtree/commandbuilder.h b/src/modules/m_spanningtree/commandbuilder.h
index 07f7c94d0..597b22751 100644
--- a/src/modules/m_spanningtree/commandbuilder.h
+++ b/src/modules/m_spanningtree/commandbuilder.h
@@ -49,15 +49,15 @@ class CmdBuilder
 		push(cmd);
 	}
 
-	CmdBuilder& push_raw(const std::string& str)
+	CmdBuilder& push_raw(const std::string& s)
 	{
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
-	CmdBuilder& push_raw(const char* str)
+	CmdBuilder& push_raw(const char* s)
 	{
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
@@ -67,17 +67,17 @@ class CmdBuilder
 		return *this;
 	}
 
-	CmdBuilder& push(const std::string& str)
+	CmdBuilder& push(const std::string& s)
 	{
 		content.push_back(' ');
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
-	CmdBuilder& push(const char* str)
+	CmdBuilder& push(const char* s)
 	{
 		content.push_back(' ');
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
@@ -96,11 +96,11 @@ class CmdBuilder
 		return *this;
 	}
 
-	CmdBuilder& push_last(const std::string& str)
+	CmdBuilder& push_last(const std::string& s)
 	{
 		content.push_back(' ');
 		content.push_back(':');
-		content.append(str);
+		content.append(s);
 		return *this;
 	}
 
@@ -112,7 +112,7 @@ class CmdBuilder
 		return *this;
 	}
 
-	void push_back(const std::string& str) { push(str); }
+	void push_back(const std::string& s) { push(s); }
 
 	const std::string& str() const { return content; }
 	operator const std::string&() const { return str(); }
-- 
cgit v1.3.1-10-gc9f91