Merge origin/release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / legacyheaders / names.h

diff --git a/src/gromacs/legacyheaders/names.h b/src/gromacs/legacyheaders/names.h
index a654b3838824288238ba78fec0d1d272417d3a8a..7b2e56aa2641f22fa2273c874b06d8a25f8c83b4 100644 (file)
--- a/src/gromacs/legacyheaders/names.h
+++ b/src/gromacs/legacyheaders/names.h
@@ -78,7 +78,6 @@ extern const char *elmceq_names[elmceqNR+1];
 extern const char *separate_dhdl_file_names[esepdhdlfileNR+1];
 extern const char *dhdl_derivatives_names[edhdlderivativesNR+1];
 extern const char *esol_names[esolNR+1];
-extern const char *enlist_names[enlistNR+1];
 extern const char *edispc_names[edispcNR+1];
 extern const char *ecm_names[ecmNR+1];
 extern const char *eann_names[eannNR+1];
@@ -98,6 +97,9 @@ extern const char *eMultentOpt_names[eMultentOptNR+1];
 extern const char *eAdresstype_names[eAdressNR+1];
 extern const char *eAdressICtype_names[eAdressICNR+1];
 extern const char *eAdressSITEtype_names[eAdressSITENR+1];
+extern const char *gmx_nblist_geometry_names[GMX_NBLIST_GEOMETRY_NR+1];
+extern const char *gmx_nbkernel_elec_names[GMX_NBKERNEL_ELEC_NR+1];
+extern const char *gmx_nbkernel_vdw_names[GMX_NBKERNEL_VDW_NR+1];
 
 #define        UNDEFINED               "UNDEFINED"
 #define ENUM_NAME(e,max,names) ((((e)<0)||((e)>=(max)))?UNDEFINED:(names)[e])