Merge branch release-2018

[alexxy/gromacs.git] / src / gromacs / utility / basedefinitions.h

diff --git a/src/gromacs/utility/basedefinitions.h b/src/gromacs/utility/basedefinitions.h
index 1c3e36c5da895c601ec318309249d02dd08507b5..a43a8d344665022e77fcd1863940d0581689658e 100644 (file)
--- a/src/gromacs/utility/basedefinitions.h
+++ b/src/gromacs/utility/basedefinitions.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -226,24 +226,6 @@ typedef uint64_t gmx_uint64_t;
 #endif
 #endif
 
-/*! \def GMX_ALIGNED(type, alignment)
- * \brief
- * Declare variable with data alignment
- *
- * \param[in] type       Type of variable
- * \param[in] alignment  Alignment in multiples of type
- *
- * Typical usage:
- * \code
-   GMX_ALIGNED(real, GMX_SIMD_REAL_WIDTH) buf[...];
-   \endcode
- */
-
-// We rely on C++11. This will for instance work for MSVC2015 and later.
-// If you get an error here, find out what attribute to use to get your compiler to align
-// data properly and add it as a case.
-#define GMX_ALIGNED(type, alignment) alignas(alignment*sizeof(type)) type
-
 /*! \brief
  * Macro to explicitly ignore an unused value.
  *