Merge branch release-2018

[alexxy/gromacs.git] / src / gromacs / hardware / architecture.h

diff --git a/src/gromacs/hardware/architecture.h b/src/gromacs/hardware/architecture.h
index aeda6c3a91479c95b34e082c46f63dad939e019c..34d5b082a18f06b30761f0bda77d3a8c2dfc653e 100644 (file)
--- a/src/gromacs/hardware/architecture.h
+++ b/src/gromacs/hardware/architecture.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017, by the GROMACS development team, led by
+ * Copyright (c) 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.
@@ -71,7 +71,7 @@ enum class Architecture
 static constexpr Architecture c_architecture =
 #if GMX_IS_X86_32 || GMX_IS_X86_64
     Architecture::X86;
-#elif defined __arm__ || defined __arm || defined _M_ARM || defined __aarch64_
+#elif defined __arm__ || defined __arm || defined _M_ARM || defined __aarch64__
     Architecture::Arm;
 #elif defined __powerpc__ || defined __ppc__ || defined __PPC__
     Architecture::PowerPC;