From 9a27608ac6c867429adcf2300557f9020fc51a28 Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Tue, 22 Sep 2015 10:06:06 +0200
Subject: [PATCH] Variable name clash (fixes gcc build)
---
alib2str/src/tree/TreeToStringComposer.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/alib2str/src/tree/TreeToStringComposer.cpp b/alib2str/src/tree/TreeToStringComposer.cpp
index d76d4651f2..ce4e2d5a43 100644
--- a/alib2str/src/tree/TreeToStringComposer.cpp
+++ b/alib2str/src/tree/TreeToStringComposer.cpp
@@ -26,9 +26,9 @@ void TreeToStringComposer::compose ( std::ostream & out, const RankedNode & node
out << std::utos ( node.getSymbol ( ).getRank ( ).getData ( ) );
- for ( const RankedNode * node : node.getChildren ( ) ) {
+ for ( const RankedNode * child : node.getChildren ( ) ) {
out << " ";
- compose ( out, * node );
+ compose ( out, * child );
}
}
@@ -46,9 +46,9 @@ void TreeToStringComposer::compose ( std::ostream & out, const alphabet::RankedS
out << std::utos ( node.getSymbol ( ).getRank ( ).getData ( ) );
- for ( const RankedNode * node : node.getChildren ( ) ) {
+ for ( const RankedNode * child : node.getChildren ( ) ) {
out << " ";
- compose ( out, subtreeWildcard, * node );
+ compose ( out, subtreeWildcard, * child );
}
}
}
@@ -62,9 +62,9 @@ TreeToStringComposer::RegistratorWrapper < void, UnrankedTree > StringToStringCo
void TreeToStringComposer::compose ( std::ostream & out, const UnrankedNode & node ) {
alib::stringApi < alphabet::Symbol >::compose ( out, node.getSymbol ( ) );
- for ( const UnrankedNode * node : node.getChildren ( ) ) {
+ for ( const UnrankedNode * child : node.getChildren ( ) ) {
out << " ";
- compose ( out, * node );
+ compose ( out, * child );
}
out << " |";
@@ -82,9 +82,9 @@ void TreeToStringComposer::compose ( std::ostream & out, const alphabet::Symbol
} else {
alib::stringApi < alphabet::Symbol >::compose ( out, node.getSymbol ( ) );
- for ( const UnrankedNode * node : node.getChildren ( ) ) {
+ for ( const UnrankedNode * child : node.getChildren ( ) ) {
out << " ";
- compose ( out, subtreeWildcard, * node );
+ compose ( out, subtreeWildcard, * child );
}
out << " |";
--
GitLab