From 69a7615d5818b928e2f377cf38d006b0bd300c8b Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Thu, 22 Jun 2017 07:47:33 +0200
Subject: [PATCH] fix variables shadowing in variant
---
alib2std/src/extensions/variant.hpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/alib2std/src/extensions/variant.hpp b/alib2std/src/extensions/variant.hpp
index 88fb2815a3..a12fe71ea0 100644
--- a/alib2std/src/extensions/variant.hpp
+++ b/alib2std/src/extensions/variant.hpp
@@ -191,7 +191,7 @@ class variant_base<ST, AT, F, Ts...> : public variant_base<ST, AT, Ts...> {
using variant_base<ST, AT, Ts...>::variant_base;
protected:
- variant_base( type_id_hash_code type_id ) : variant_base<ST, AT, Ts...>::variant_base ( type_id ) { }
+ variant_base( type_id_hash_code id ) : variant_base<ST, AT, Ts...>::variant_base ( id ) { }
public:
variant_base(const F& value) : variant_base<ST, AT, Ts...>::variant_base ( type_id_hash_code ( typeid(F).hash_code() ) ) { new (&this->data) F(value); }
@@ -205,7 +205,7 @@ class variant_base<ST, AT, void, Ts...> : public variant_base<ST, AT, Ts...> {
using variant_base<ST, AT, Ts...>::variant_base;
protected:
- variant_base( type_id_hash_code type_id ) : variant_base<ST, AT, Ts...>::variant_base ( type_id ) { }
+ variant_base( type_id_hash_code id ) : variant_base<ST, AT, Ts...>::variant_base ( id ) { }
public:
variant_base() : variant_base<ST, AT, Ts...>::variant_base ( type_id_hash_code ( typeid(void).hash_code() ) ) { }
--
GitLab