Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / nbnxn_kernels / nbnxn_kernel_ref_outer.h

diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h
index 9c721039b04b1514f029ca174dcb3479bc8b0cf5..7e09a77b36d88645c8bf8507ae17ac02ff909b08 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_ref_outer.h
@@ -50,13 +50,13 @@
 #define CALC_SHIFTFORCES
 
 #ifdef CALC_COUL_RF
-#define NBK_FUNC_NAME(x, y) x ## _rf_ ## y
+#define NBK_FUNC_NAME(base, ene) base ## _rf_ ## ene
 #endif
 #ifdef CALC_COUL_TAB
 #ifndef VDW_CUTOFF_CHECK
-#define NBK_FUNC_NAME(x, y) x ## _tab_ ## y
+#define NBK_FUNC_NAME(base, ene) base ## _tab_ ## ene
 #else
-#define NBK_FUNC_NAME(x, y) x ## _tab_twin_ ## y
+#define NBK_FUNC_NAME(base, ene) base ## _tab_twin_ ## ene
 #endif
 #endif