From a7fe249964f14ab84abf265c794cb6731367128f Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Fri, 2 Jul 2021 09:00:51 +0700 Subject: [PATCH] fix gcc-7 warnings --- headers/meta.hpp/meta_class_info.hpp | 24 ++++++++++++------------ headers/meta.hpp/meta_data_info.hpp | 4 ++-- headers/meta.hpp/meta_field_info.hpp | 4 ++-- headers/meta.hpp/meta_function_info.hpp | 4 ++-- headers/meta.hpp/meta_method_info.hpp | 4 ++-- headers/meta.hpp/meta_namespace_info.hpp | 20 ++++++++++---------- headers/meta.hpp/meta_variable_info.hpp | 4 ++-- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/headers/meta.hpp/meta_class_info.hpp b/headers/meta.hpp/meta_class_info.hpp index 706fcce..c2241c0 100644 --- a/headers/meta.hpp/meta_class_info.hpp +++ b/headers/meta.hpp/meta_class_info.hpp @@ -37,43 +37,43 @@ namespace meta_hpp template < typename F > void each_class(F&& f) const { - for ( auto [_, info] : classes_ ) { - std::invoke(f, info); + for ( auto&& id_info : classes_ ) { + std::invoke(f, id_info.second); } } template < typename F > void each_data(F&& f) const { - for ( auto [_, info] : datas_ ) { - std::invoke(f, info); + for ( auto&& id_info : datas_ ) { + std::invoke(f, id_info.second); } } template < typename F > void each_field(F&& f) const { - for ( auto [_, info] : fields_ ) { - std::invoke(f, info); + for ( auto&& id_info : fields_ ) { + std::invoke(f, id_info.second); } } template < typename F > void each_function(F&& f) const { - for ( auto [_, info] : functions_ ) { - std::invoke(f, info); + for ( auto&& id_info : functions_ ) { + std::invoke(f, id_info.second); } } template < typename F > void each_method(F&& f) const { - for ( auto [_, info] : methods_ ) { - std::invoke(f, info); + for ( auto&& id_info : methods_ ) { + std::invoke(f, id_info.second); } } template < typename F > void each_variable(F&& f) const { - for ( auto [_, info] : variables_ ) { - std::invoke(f, info); + for ( auto&& id_info : variables_ ) { + std::invoke(f, id_info.second); } } diff --git a/headers/meta.hpp/meta_data_info.hpp b/headers/meta.hpp/meta_data_info.hpp index 773208d..b9cbbae 100644 --- a/headers/meta.hpp/meta_data_info.hpp +++ b/headers/meta.hpp/meta_data_info.hpp @@ -31,8 +31,8 @@ namespace meta_hpp template < typename F > void each_data(F&& f) const { - for ( auto [_, info] : datas_ ) { - std::invoke(f, info); + for ( auto&& id_info : datas_ ) { + std::invoke(f, id_info.second); } } diff --git a/headers/meta.hpp/meta_field_info.hpp b/headers/meta.hpp/meta_field_info.hpp index 2690461..e4b9f00 100644 --- a/headers/meta.hpp/meta_field_info.hpp +++ b/headers/meta.hpp/meta_field_info.hpp @@ -86,8 +86,8 @@ namespace meta_hpp template < typename F > void each_data(F&& f) const { - for ( auto [_, info] : datas_ ) { - std::invoke(f, info); + for ( auto&& id_info : datas_ ) { + std::invoke(f, id_info.second); } } diff --git a/headers/meta.hpp/meta_function_info.hpp b/headers/meta.hpp/meta_function_info.hpp index 6d8d355..443b3bb 100644 --- a/headers/meta.hpp/meta_function_info.hpp +++ b/headers/meta.hpp/meta_function_info.hpp @@ -91,8 +91,8 @@ namespace meta_hpp template < typename F > void each_data(F&& f) const { - for ( auto [_, info] : datas_ ) { - std::invoke(f, info); + for ( auto&& id_info : datas_ ) { + std::invoke(f, id_info.second); } } diff --git a/headers/meta.hpp/meta_method_info.hpp b/headers/meta.hpp/meta_method_info.hpp index 4fcd699..8025b44 100644 --- a/headers/meta.hpp/meta_method_info.hpp +++ b/headers/meta.hpp/meta_method_info.hpp @@ -154,8 +154,8 @@ namespace meta_hpp template < typename F > void each_data(F&& f) const { - for ( auto [_, info] : datas_ ) { - std::invoke(f, info); + for ( auto&& id_info : datas_ ) { + std::invoke(f, id_info.second); } } diff --git a/headers/meta.hpp/meta_namespace_info.hpp b/headers/meta.hpp/meta_namespace_info.hpp index 66a3f69..a27584c 100644 --- a/headers/meta.hpp/meta_namespace_info.hpp +++ b/headers/meta.hpp/meta_namespace_info.hpp @@ -32,36 +32,36 @@ namespace meta_hpp template < typename F > void each_class(F&& f) const { - for ( auto [_, info] : classes_ ) { - std::invoke(f, info); + for ( auto&& id_info : classes_ ) { + std::invoke(f, id_info.second); } } template < typename F > void each_data(F&& f) const { - for ( auto [_, info] : datas_ ) { - std::invoke(f, info); + for ( auto&& id_info : datas_ ) { + std::invoke(f, id_info.second); } } template < typename F > void each_function(F&& f) const { - for ( auto [_, info] : functions_ ) { - std::invoke(f, info); + for ( auto&& id_info : functions_ ) { + std::invoke(f, id_info.second); } } template < typename F > void each_namespace(F&& f) const { - for ( auto [_, info] : namespaces_ ) { - std::invoke(f, info); + for ( auto&& id_info : namespaces_ ) { + std::invoke(f, id_info.second); } } template < typename F > void each_variable(F&& f) const { - for ( auto [_, info] : variables_ ) { - std::invoke(f, info); + for ( auto&& id_info : variables_ ) { + std::invoke(f, id_info.second); } } diff --git a/headers/meta.hpp/meta_variable_info.hpp b/headers/meta.hpp/meta_variable_info.hpp index 9e6b27b..f4e2f7b 100644 --- a/headers/meta.hpp/meta_variable_info.hpp +++ b/headers/meta.hpp/meta_variable_info.hpp @@ -82,8 +82,8 @@ namespace meta_hpp template < typename F > void each_data(F&& f) const { - for ( auto [_, info] : datas_ ) { - std::invoke(f, info); + for ( auto&& id_info : datas_ ) { + std::invoke(f, id_info.second); } }