From 879829a119babb9a5e54a8ace553917831114f34 Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Thu, 18 Jun 2015 23:37:16 -0400 Subject: [PATCH] Fix GMX_ALIGNMENT for MSVC 2012 and 2013 Issue previously identified for 2010 is not fixed until 2015. Change-Id: I617ac9524a2e054b325fdc19675fdee0a60370c8 --- src/gromacs/utility/basedefinitions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gromacs/utility/basedefinitions.h b/src/gromacs/utility/basedefinitions.h index 4e5dc6d3e9..cc708bca06 100644 --- a/src/gromacs/utility/basedefinitions.h +++ b/src/gromacs/utility/basedefinitions.h @@ -240,8 +240,8 @@ typedef uint64_t gmx_uint64_t; */ /* alignas(x) is not used even with GMX-CXX11 because it isn't in the list of tested features and thus might not be supported. - MSVC2010 has align but doesn't support sizeof inside. */ -#if defined(_MSC_VER) && (_MSC_VER >= 1700 || defined(__ICL)) + MSVC before 2015 has align but doesn't support sizeof inside. */ +#if defined(_MSC_VER) && (_MSC_VER > 1800 || defined(__ICL)) # define GMX_ALIGNMENT 1 # define GMX_ALIGNED(type, alignment) __declspec(align(alignment*sizeof(type))) type #elif defined(__GNUC__) || defined(__clang__) -- 2.22.0