Ajust name of default easing to prevent compilation errors

mobius3 · Aug 2, 2019 · 1c2eb4e · 1c2eb4e
1 parent 545876f
commit 1c2eb4e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/include/easing.h b/include/easing.h
@@ -175,7 +175,7 @@ namespace tweeny {
                 static typename std::enable_if<!supports_arithmetic_operations<T>::value, T>::type run(float position, T start, T end) {
                     return start;
                 }
-            } default = defaultEasing{};
+            } def = defaultEasing{};
 
             /**
              * @ingroup linear

diff --git a/include/easingresolve.h b/include/easingresolve.h
@@ -78,7 +78,7 @@ namespace tweeny {
             typedef typename std::tuple_element<I, TypeTuple>::type ArgType;
 
             static void impl(FunctionTuple &b, easing::defaultEasing, Fs... fs) {
-                get<I>(b) = easing::default.run<ArgType>;
+                get<I>(b) = easing::def.run<ArgType>;
                 easingresolve<I + 1, TypeTuple, FunctionTuple, Fs...>::impl(b, fs...);
             }
         };

diff --git a/include/tweenpoint.tcc b/include/tweenpoint.tcc
@@ -69,7 +69,7 @@ namespace tweeny {
         template<typename... Ts>
         inline tweenpoint<Ts...>::tweenpoint(Ts... vs) : values{vs...} {
             during(static_cast<uint16_t>(0));
-            via(easing::default);
+            via(easing::def);
         }
 
         template<typename... Ts>