simplify and comb std tree

alib2std/src/extensions/forward_tree.hpp

@@ -33,24 +33,22 @@ public:
 		return m_children;
 	}
-	void nicePrint ( std::ostream & os, const std::string & prefix, const bool last ) const {
+	void nicePrint ( std::ostream & os, std::string prefix, const bool last ) const {
 		os << prefix;
-		std::string nextPrefix ( prefix );
-
 		if ( last ) {
 			os << "\\-";
-			nextPrefix += "  ";
+			prefix += "  ";
 		} else {
 			os << "|-";
-			nextPrefix += "| ";
+			prefix += "| ";
 		}
 		os << getData ( ) << std::endl;
 		for ( unsigned int i = 0; i < m_children.size ( ); ++i ) {
-			os << nextPrefix << "|" << std::endl;
-			m_children[i].nicePrint ( os, nextPrefix, i == m_children.size ( ) - 1 );
+			os << prefix << "|" << std::endl;
+			m_children[i].nicePrint ( os, prefix, i == m_children.size ( ) - 1 );
 		}
 	}

alib2std/src/extensions/tree.hpp

@@ -42,24 +42,22 @@ public:
 		return m_children;
 	}
-	void nicePrint ( std::ostream & os, const std::string & prefix, const bool last ) const {
+	void nicePrint ( std::ostream & os, std::string prefix, const bool last ) const {
 		os << prefix;
-		std::string nextPrefix ( prefix );
-
 		if ( last ) {
 			os << "\\-";
-			nextPrefix += "  ";
+			prefix += "  ";
 		} else {
 			os << "|-";
-			nextPrefix += "| ";
+			prefix += "| ";
 		}
 		os << getData ( ) << std::endl;
 		for ( unsigned int i = 0; i < m_children.size ( ); ++i ) {
-			os << nextPrefix << "|" << std::endl;
-			m_children[i].nicePrint ( os, nextPrefix, i == m_children.size ( ) - 1 );
+			os << prefix << "|" << std::endl;
+			m_children[i].nicePrint ( os, prefix, i == m_children.size ( ) - 1 );
 		}
 	}

alib2std/src/forward_tree

@@ -11,5 +11,5 @@
 #include "extensions/tree_base.hpp"
 #include "extensions/forward_tree.hpp"
-#endif /* __TREE_HEADER_WRAPPER */
+#endif /* __TREE_HEADER_WRAPPER_ */

alib2std/src/tree

@@ -11,5 +11,5 @@
 #include "extensions/tree_base.hpp"
 #include "extensions/tree.hpp"
-#endif /* __TREE_HEADER_WRAPPER */
+#endif /* __TREE_HEADER_WRAPPER_ */