Skip to content

Commit 40a66eb

Browse files
author
tempate
committed
Fix - Declaration of info hides member
Signed-off-by: tempate <danieldiaz@eprosima.com>
1 parent 8616ac7 commit 40a66eb

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/cpp/utils/collections/TreeNode.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ struct Node
3535

3636
Node();
3737
Node(
38-
const Info& info);
38+
const Info& inner_info);
3939
Node(
40-
Info&& info);
40+
Info&& inner_info);
4141

4242
template<typename ... Args>
4343
Node(
@@ -57,9 +57,9 @@ class TreeNode : public Node<Info>
5757
using Node<Info>::Node;
5858

5959
void add_branch(
60-
const Info& info);
60+
const Info& inner_info);
6161
void add_branch(
62-
Info&& info);
62+
Info&& inner_info);
6363
void add_branch(
6464
const TreeNode& node);
6565
void add_branch(

src/cpp/utils/collections/impl/TreeNode.ipp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ Node<Info>::Node()
3434

3535
template <typename Info>
3636
Node<Info>::Node(
37-
const Info& info)
38-
: info(info)
37+
const Info& inner_info)
38+
: info(inner_info)
3939
{
4040
// Do nothing
4141
}
4242

4343
template <typename Info>
4444
Node<Info>::Node(
45-
Info&& info)
46-
: info(std::move(info))
45+
Info&& inner_info)
46+
: info(std::move(inner_info))
4747
{
4848
// Do nothing
4949
}
@@ -59,16 +59,16 @@ Node<Info>::Node(
5959

6060
template <typename Info>
6161
void TreeNode<Info>::add_branch(
62-
const Info& info)
62+
const Info& inner_info)
6363
{
64-
branches_.push_back(TreeNode(info));
64+
branches_.push_back(TreeNode(inner_info));
6565
}
6666

6767
template <typename Info>
6868
void TreeNode<Info>::add_branch(
69-
Info&& info)
69+
Info&& inner_info)
7070
{
71-
branches_.push_back(TreeNode(std::move(info)));
71+
branches_.push_back(TreeNode(std::move(inner_info)));
7272
}
7373

7474
template <typename Info>

0 commit comments

Comments
 (0)