From aa605d1fa28da60d6c79f49005faa069cdf4b09a Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 9 Nov 2016 17:35:29 +0100
Subject: [PATCH] fix 4 jenkins variable shadow error
---
alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.h | 8 ++++----
alib2data/src/tree/ranked/PrefixRankedPattern.h | 8 ++++----
alib2data/src/tree/ranked/PrefixRankedTree.h | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.h b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.h
index 6e4a8a2ac7..643564a0c9 100644
--- a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.h
+++ b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.h
@@ -193,14 +193,14 @@ void PrefixRankedNonlinearPattern < SymbolType, RankType >::setContent ( std::ve
template < class SymbolType, class RankType >
void PrefixRankedNonlinearPattern < SymbolType, RankType >::arityChecksum ( const std::vector < std::ranked_symbol < SymbolType, RankType > > & data ) {
- int arityChecksum = 1;
+ int arityChecksumAcc = 1;
for ( const std::ranked_symbol < SymbolType, RankType > & symbol : data ) {
- arityChecksum += symbol.getRank ( ).getData ( );
- arityChecksum -= 1;
+ arityChecksumAcc += symbol.getRank ( ).getData ( );
+ arityChecksumAcc -= 1;
}
- if ( arityChecksum != 0 ) throw TreeException ( "The string does not form a tree" );
+ if ( arityChecksumAcc != 0 ) throw TreeException ( "The string does not form a tree" );
}
template < class SymbolType, class RankType >
diff --git a/alib2data/src/tree/ranked/PrefixRankedPattern.h b/alib2data/src/tree/ranked/PrefixRankedPattern.h
index a66303ce9e..988cc22b8c 100644
--- a/alib2data/src/tree/ranked/PrefixRankedPattern.h
+++ b/alib2data/src/tree/ranked/PrefixRankedPattern.h
@@ -165,14 +165,14 @@ void PrefixRankedPattern < SymbolType, RankType >::setContent ( std::vector < st
template < class SymbolType, class RankType >
void PrefixRankedPattern < SymbolType, RankType >::arityChecksum ( const std::vector < std::ranked_symbol < SymbolType, RankType > > & data ) {
- int arityChecksum = 1;
+ int arityChecksumAcc = 1;
for ( const std::ranked_symbol < SymbolType, RankType > & symbol : data ) {
- arityChecksum += symbol.getRank ( ).getData ( );
- arityChecksum -= 1;
+ arityChecksumAcc += symbol.getRank ( ).getData ( );
+ arityChecksumAcc -= 1;
}
- if ( arityChecksum != 0 ) throw TreeException ( "The string does not form a tree" );
+ if ( arityChecksumAcc != 0 ) throw TreeException ( "The string does not form a tree" );
}
template < class SymbolType, class RankType >
diff --git a/alib2data/src/tree/ranked/PrefixRankedTree.h b/alib2data/src/tree/ranked/PrefixRankedTree.h
index d804c9246c..e4842315de 100644
--- a/alib2data/src/tree/ranked/PrefixRankedTree.h
+++ b/alib2data/src/tree/ranked/PrefixRankedTree.h
@@ -152,14 +152,14 @@ void PrefixRankedTree < SymbolType, RankType >::setContent ( std::vector < std::
template < class SymbolType, class RankType >
void PrefixRankedTree < SymbolType, RankType >::arityChecksum ( const std::vector < std::ranked_symbol < SymbolType, RankType > > & data ) {
- int arityChecksum = 1;
+ int arityChecksumAcc = 1;
for ( const std::ranked_symbol < SymbolType, RankType > & symbol : data ) {
- arityChecksum += symbol.getRank ( ).getData ( );
- arityChecksum -= 1;
+ arityChecksumAcc += symbol.getRank ( ).getData ( );
+ arityChecksumAcc -= 1;
}
- if ( arityChecksum != 0 ) throw TreeException ( "The string does not form a tree" );
+ if ( arityChecksumAcc != 0 ) throw TreeException ( "The string does not form a tree" );
}
template < class SymbolType, class RankType >
--
GitLab