From 0f60e67c9c432cf257b7aff14b545d42a5ab1a52 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 9 Nov 2016 18:39:17 +0100
Subject: [PATCH] fix 5 jenkins variable shadow error
---
alib2algo_experimental/src/graph/datastructs/Array.h | 10 +++++-----
alib2data/src/rte/RTE.cpp | 1 -
alib2data/src/rte/RTE.h | 1 -
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/alib2algo_experimental/src/graph/datastructs/Array.h b/alib2algo_experimental/src/graph/datastructs/Array.h
index d683e7795a..277f0873fd 100644
--- a/alib2algo_experimental/src/graph/datastructs/Array.h
+++ b/alib2algo_experimental/src/graph/datastructs/Array.h
@@ -13,20 +13,20 @@ class Array {
public:
- Array( uint length ) { _Carray = new elem_t [ length ]; _length = length; }
+ Array( uint len ) { _Carray = new elem_t [ len ]; _length = len; }
~Array() { delete [] _Carray; }
inline elem_t & operator[](uint index) { return _Carray[ index ]; }
inline const elem_t & operator[](uint index) const { return _Carray[ index ]; }
- void resize(uint length)
+ void resize(uint len)
{
- elem_t * newArr = new elem_t [ length ];
- for (uint i = 0; i < _length && i < length; i++)
+ elem_t * newArr = new elem_t [ len ];
+ for (uint i = 0; i < _length && i < len; i++)
newArr[i] = std::move( _Carray[i] );
delete [] _Carray;
_Carray = newArr;
- _length = length;
+ _length = len;
}
inline uint length() const { return _length; }
diff --git a/alib2data/src/rte/RTE.cpp b/alib2data/src/rte/RTE.cpp
index 00a2445ae6..0e177b8a13 100644
--- a/alib2data/src/rte/RTE.cpp
+++ b/alib2data/src/rte/RTE.cpp
@@ -7,7 +7,6 @@
#include "RTE.h"
#include "../alphabet/Symbol.h"
-#include "../string/LinearString.h"
#include <core/xmlApi.hpp>
diff --git a/alib2data/src/rte/RTE.h b/alib2data/src/rte/RTE.h
index cfe57b412d..5a008990bc 100644
--- a/alib2data/src/rte/RTE.h
+++ b/alib2data/src/rte/RTE.h
@@ -12,7 +12,6 @@
#include <base/WrapperBase.hpp>
#include "../alphabet/SymbolFeatures.h"
-#include "../string/StringFeatures.h"
#include <set>
#include <string>
--
GitLab