From 3d9fdeac76856f5b9d68c9e9367c7f0a0a1467b8 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Thu, 17 Aug 2017 18:06:05 +0300 Subject: [PATCH] Fix VS2017 build (#551) --- src/game/Movement/Spline/MovementTypedefs.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/game/Movement/Spline/MovementTypedefs.h b/src/game/Movement/Spline/MovementTypedefs.h index f28c075a1..5c9274582 100644 --- a/src/game/Movement/Spline/MovementTypedefs.h +++ b/src/game/Movement/Spline/MovementTypedefs.h @@ -35,12 +35,6 @@ namespace Movement float computeFallTime(float path_length, bool isSafeFall); float computeFallElevation(float t_passed, bool isSafeFall, float start_velocity = 0.0f); -#ifndef static_assert - #define CONCAT(x, y) CONCAT1 (x, y) - #define CONCAT1(x, y) x##y - #define static_assert(expr, msg) typedef char CONCAT(static_assert_failed_at_line_, __LINE__) [(expr) ? 1 : -1] -#endif - template class counter {