summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Dootson <u404261@methods.local>2019-10-14 14:14:45 +0100
committerMurray Cumming <murrayc@murrayc.com>2019-10-25 12:57:31 +0200
commitb74406a54b844f41ec1dc5c535c4fa07336fc77d (patch)
tree78b6a93d7d9de946eebbf3ed6b7417254386e9c7
parent5586a71f42b047c2542425a6a296a557d7593e6b (diff)
downloadsigc++-b74406a54b844f41ec1dc5c535c4fa07336fc77d.tar.gz
MSVC build: Fix 'C4127: conditional expression is constant' warning
-rw-r--r--sigc++/tuple-utils/tuple_for_each.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/sigc++/tuple-utils/tuple_for_each.h b/sigc++/tuple-utils/tuple_for_each.h
index 15e8a20..e179ffe 100644
--- a/sigc++/tuple-utils/tuple_for_each.h
+++ b/sigc++/tuple-utils/tuple_for_each.h
@@ -99,13 +99,11 @@ tuple_for_each(T&& t, T_extras&&... extras)
// We use std::decay_t<> because tuple_size is not defined for references.
constexpr auto size = std::tuple_size<std::decay_t<T>>::value;
- if (size == 0)
+ if constexpr (size != 0)
{
- return;
+ detail::tuple_for_each_impl<T_visitor, size, T_extras...>::tuple_for_each(
+ std::forward<T>(t), std::forward<T_extras>(extras)...);
}
-
- detail::tuple_for_each_impl<T_visitor, size, T_extras...>::tuple_for_each(
- std::forward<T>(t), std::forward<T_extras>(extras)...);
}
} // namespace internal