Merge branch '11.2' into 'master'11.2

add upstream 11.2

See merge request opensource-tracking/FreeFileSync!26

1 files changed, 3 insertions, 6 deletions

diff --git a/zen/basic_math.h b/zen/basic_math.h
index 0e30c276..26fb9e58 100644
--- a/zen/basic_math.h
+++ b/zen/basic_math.h
@@ -183,18 +183,15 @@ auto integerDivideRoundUp(N numerator, D denominator)
 namespace
 {
 template <size_t N, class T> struct PowerImpl;
-/*
-    template <size_t N, class T> -> let's use non-recursive specializations to help the compiler
-    struct PowerImpl { static T result(const T& value) { return PowerImpl<N - 1, T>::result(value) * value; } };
-*/
+//let's use non-recursive specializations to help the compiler
 template <class T> struct PowerImpl<2, T> { static T result(T value) { return value * value; } };
 template <class T> struct PowerImpl<3, T> { static T result(T value) { return value * value * value; } };
 }
 
-template <size_t n, class T> inline
+template <size_t N, class T> inline
 T power(T value)
 {
-    return PowerImpl<n, T>::result(value);
+    return PowerImpl<N, T>::result(value);
 }