Remove preprocessor usage for atomInfo

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

diff --git a/src/gromacs/domdec/utility.h b/src/gromacs/domdec/utility.h
index ce65383f19a984454f8c1f1de88f4ec53af56c36..09c8b9a1e3b66cbe5c921b7fa55292109e584a31 100644 (file)
--- a/src/gromacs/domdec/utility.h
+++ b/src/gromacs/domdec/utility.h
@@ -43,7 +43,7 @@
 #define GMX_DOMDEC_DOMDEC_UTILITY_H
 
 #include "gromacs/math/vectypes.h"
-#include "gromacs/mdtypes/forcerec.h"
+#include "gromacs/mdtypes/atominfo.h"
 
 #include "domdec_internal.h"
 
@@ -83,15 +83,15 @@ void make_tric_corr_matrix(int npbcdim, const matrix box, matrix tcm);
 void check_screw_box(const matrix box);
 
 /*! \brief Return the atom information flags for atom a */
-static inline int ddGetAtomInfo(gmx::ArrayRef<const AtomInfoWithinMoleculeBlock> atomInfoForEachMoleculeBlock,
-                                int                                              a)
+static inline int ddGetAtomInfo(gmx::ArrayRef<const gmx::AtomInfoWithinMoleculeBlock> atomInfoForEachMoleculeBlock,
+                                int                                                   a)
 {
     size_t index = 0;
     while (a >= atomInfoForEachMoleculeBlock[index].indexOfLastAtomInMoleculeBlock)
     {
         index++;
     }
-    const AtomInfoWithinMoleculeBlock& atomInfoOfMoleculeBlock = atomInfoForEachMoleculeBlock[index];
+    const gmx::AtomInfoWithinMoleculeBlock& atomInfoOfMoleculeBlock = atomInfoForEachMoleculeBlock[index];
 
     return atomInfoOfMoleculeBlock.atomInfo[(a - atomInfoOfMoleculeBlock.indexOfFirstAtomInMoleculeBlock)
                                             % atomInfoOfMoleculeBlock.atomInfo.size()];