Merge branch 'dev' into feature/shared_experiments

This commit is contained in:
BlackMATov
2024-01-30 17:22:05 +07:00
3 changed files with 16 additions and 8 deletions

View File

@@ -4996,7 +4996,8 @@ namespace meta_hpp
&& "provided argument names don't match constructor argument count"
);
for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
using std::min; // prevents windows.h min/max issues
for ( std::size_t i{}, e{min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
@@ -5038,7 +5039,8 @@ namespace meta_hpp
&& "provided argument names don't match function argument count"
);
for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
using std::min; // prevents windows.h min/max issues
for ( std::size_t i{}, e{min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
@@ -5087,7 +5089,8 @@ namespace meta_hpp
&& "provided argument names don't match method argument count"
);
for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
using std::min; // prevents windows.h min/max issues
for ( std::size_t i{}, e{min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
@@ -5213,7 +5216,8 @@ namespace meta_hpp
&& "provided arguments don't match function argument count"
);
for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
using std::min; // prevents windows.h min/max issues
for ( std::size_t i{}, e{min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());

View File

@@ -43,7 +43,8 @@ namespace meta_hpp
&& "provided argument names don't match constructor argument count"
);
for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
using std::min; // prevents windows.h min/max issues
for ( std::size_t i{}, e{min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
@@ -85,7 +86,8 @@ namespace meta_hpp
&& "provided argument names don't match function argument count"
);
for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
using std::min; // prevents windows.h min/max issues
for ( std::size_t i{}, e{min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());
@@ -134,7 +136,8 @@ namespace meta_hpp
&& "provided argument names don't match method argument count"
);
for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
using std::min; // prevents windows.h min/max issues
for ( std::size_t i{}, e{min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());

View File

@@ -36,7 +36,8 @@ namespace meta_hpp
&& "provided arguments don't match function argument count"
);
for ( std::size_t i{}, e{std::min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
using std::min; // prevents windows.h min/max issues
for ( std::size_t i{}, e{min(arguments.size(), state->arguments.size())}; i < e; ++i ) {
argument& arg = state->arguments[i];
detail::state_access(arg)->name = std::move(arguments[i].get_name());
detail::state_access(arg)->metadata = std::move(arguments[i].get_metadata());