From 0ed7e9ac8366d643d4946b124c998dd96895e946 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 9 Nov 2016 16:43:04 +0100
Subject: [PATCH] fix 2 jenkins variable shadow error
---
alib2common/src/container/ObjectsDeque.h | 2 +-
alib2common/src/container/ObjectsList.h | 2 +-
alib2common/src/container/ObjectsMap.h | 2 +-
alib2common/src/container/ObjectsPair.h | 2 +-
alib2common/src/container/ObjectsSet.h | 2 +-
alib2common/src/container/ObjectsTree.h | 2 +-
alib2common/src/container/ObjectsVector.h | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/alib2common/src/container/ObjectsDeque.h b/alib2common/src/container/ObjectsDeque.h
index cc06e7b33e..049e821805 100644
--- a/alib2common/src/container/ObjectsDeque.h
+++ b/alib2common/src/container/ObjectsDeque.h
@@ -59,7 +59,7 @@ public:
};
template < class ElementType >
-ObjectsDeque < ElementType >::ObjectsDeque ( std::deque < ElementType > data ) : std::deque < ElementType > ( std::move ( data ) ) {
+ObjectsDeque < ElementType >::ObjectsDeque ( std::deque < ElementType > raw ) : std::deque < ElementType > ( std::move ( raw ) ) {
}
template < class ElementType >
diff --git a/alib2common/src/container/ObjectsList.h b/alib2common/src/container/ObjectsList.h
index 0b30f5879e..6c8510714b 100644
--- a/alib2common/src/container/ObjectsList.h
+++ b/alib2common/src/container/ObjectsList.h
@@ -59,7 +59,7 @@ public:
};
template < class ElementType >
-ObjectsList < ElementType >::ObjectsList ( std::list < ElementType > data ) : std::list < ElementType > ( std::move ( data ) ) {
+ObjectsList < ElementType >::ObjectsList ( std::list < ElementType > raw ) : std::list < ElementType > ( std::move ( raw ) ) {
}
template < class ElementType >
diff --git a/alib2common/src/container/ObjectsMap.h b/alib2common/src/container/ObjectsMap.h
index 5681543240..aafec1d139 100644
--- a/alib2common/src/container/ObjectsMap.h
+++ b/alib2common/src/container/ObjectsMap.h
@@ -61,7 +61,7 @@ public:
};
template < class KeyType, class ValueType >
-ObjectsMap<KeyType, ValueType>::ObjectsMap ( std::map < KeyType, ValueType > data ) : std::map < KeyType, ValueType > ( std::move ( data ) ) {
+ObjectsMap<KeyType, ValueType>::ObjectsMap ( std::map < KeyType, ValueType > raw ) : std::map < KeyType, ValueType > ( std::move ( raw ) ) {
}
diff --git a/alib2common/src/container/ObjectsPair.h b/alib2common/src/container/ObjectsPair.h
index 13abfc482a..d0f8503793 100644
--- a/alib2common/src/container/ObjectsPair.h
+++ b/alib2common/src/container/ObjectsPair.h
@@ -59,7 +59,7 @@ public:
};
template < class KeyType, class ValueType >
-ObjectsPair < KeyType, ValueType >::ObjectsPair(std::pair<KeyType, ValueType> data) : std::pair<KeyType, ValueType>(std::move(data)) {
+ObjectsPair < KeyType, ValueType >::ObjectsPair(std::pair<KeyType, ValueType> raw) : std::pair<KeyType, ValueType>(std::move(raw)) {
}
diff --git a/alib2common/src/container/ObjectsSet.h b/alib2common/src/container/ObjectsSet.h
index 1de6c6df61..1195aca583 100644
--- a/alib2common/src/container/ObjectsSet.h
+++ b/alib2common/src/container/ObjectsSet.h
@@ -59,7 +59,7 @@ public:
};
template < class ElementType >
-ObjectsSet < ElementType >::ObjectsSet(std::set<ElementType> data) : std::set<ElementType>(std::move(data)) {
+ObjectsSet < ElementType >::ObjectsSet(std::set<ElementType> raw) : std::set<ElementType>(std::move(raw)) {
}
diff --git a/alib2common/src/container/ObjectsTree.h b/alib2common/src/container/ObjectsTree.h
index 4dc894a0e2..d4856161b6 100644
--- a/alib2common/src/container/ObjectsTree.h
+++ b/alib2common/src/container/ObjectsTree.h
@@ -58,7 +58,7 @@ public:
};
template < class ElementType >
-ObjectsTree < ElementType >::ObjectsTree ( std::tree < ElementType > data ) : std::tree < ElementType > ( std::move ( data ) ) {
+ObjectsTree < ElementType >::ObjectsTree ( std::tree < ElementType > raw ) : std::tree < ElementType > ( std::move ( raw ) ) {
}
template < class ElementType >
diff --git a/alib2common/src/container/ObjectsVector.h b/alib2common/src/container/ObjectsVector.h
index c1f00206be..d191758a1f 100644
--- a/alib2common/src/container/ObjectsVector.h
+++ b/alib2common/src/container/ObjectsVector.h
@@ -59,7 +59,7 @@ public:
};
template < class ElementType >
-ObjectsVector < ElementType >::ObjectsVector ( std::vector < ElementType > data ) : std::vector < ElementType > ( std::move ( data ) ) {
+ObjectsVector < ElementType >::ObjectsVector ( std::vector < ElementType > raw ) : std::vector < ElementType > ( std::move ( raw ) ) {
}
template < class ElementType >
--
GitLab