Merge branch release-2018

[alexxy/gromacs.git] / src / gromacs / fileio / tngio.cpp

diff --git a/src/gromacs/fileio/tngio.cpp b/src/gromacs/fileio/tngio.cpp
index d9d67fa0a5f23a1f4fa3d6f01254cd9743123224..eb62e4c7563a8acf309309cf6bf9a3193301c2a3 100644 (file)
--- a/src/gromacs/fileio/tngio.cpp
+++ b/src/gromacs/fileio/tngio.cpp
@@ -65,6 +65,10 @@
 #include "gromacs/utility/sysinfo.h"
 #include "gromacs/utility/unique_cptr.h"
 
+#if !GMX_USE_TNG
+using tng_trajectory_t = void *;
+#endif
+
 /*! \brief Gromacs Wrapper around tng datatype
  *
  * This could in principle hold any GROMACS-specific requirements not yet
@@ -92,6 +96,7 @@ struct gmx_tng_trajectory
     int              lambdaOutputInterval; //!< Number of steps between the output of lambdas
 };
 
+#if GMX_USE_TNG
 static const char *modeToVerb(char mode)
 {
     const char *p;
@@ -111,6 +116,7 @@ static const char *modeToVerb(char mode)
     }
     return p;
 }
+#endif
 
 void gmx_tng_open(const char           *filename,
                   char                  mode,