Removed fileio/trx.h from typedefs.h

Change-Id: I0d53234cd33f440410701af723cf21058f86bfdc

diff --git a/src/gromacs/gmxana/gmx_bundle.cpp b/src/gromacs/gmxana/gmx_bundle.cpp
index d5b228d61a49cdda27c3a5a4b8d78009951aa72d..a785340fad357964251fcc8a8cf7fdce5c698dea 100644 (file)
--- a/src/gromacs/gmxana/gmx_bundle.cpp
+++ b/src/gromacs/gmxana/gmx_bundle.cpp
@@ -41,6 +41,7 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"

diff --git a/src/gromacs/gmxana/gmx_clustsize.cpp b/src/gromacs/gmxana/gmx_clustsize.cpp
index cd736f4759e1b05ef49a1030320e2c530d55f2cb..b903bbb79f0039bbfc96b0886fd69958312c9166 100644 (file)
--- a/src/gromacs/gmxana/gmx_clustsize.cpp
+++ b/src/gromacs/gmxana/gmx_clustsize.cpp
@@ -43,6 +43,7 @@
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/matio.h"
 #include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"

diff --git a/src/gromacs/gmxana/gmx_current.cpp b/src/gromacs/gmxana/gmx_current.cpp
index 4ac18801dc33cf6ce9dac96171085f3a6cd2904d..a956424ec98ac85ba3514e0d810ea6df7231044e 100644 (file)
--- a/src/gromacs/gmxana/gmx_current.cpp
+++ b/src/gromacs/gmxana/gmx_current.cpp
@@ -39,6 +39,7 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"

diff --git a/src/gromacs/gmxana/gmx_dos.cpp b/src/gromacs/gmxana/gmx_dos.cpp
index c7c6cb66ab8050bc536a32033474af211818d634..7d010f68a5b953c524a18c1af55d557071f13f89 100644 (file)
--- a/src/gromacs/gmxana/gmx_dos.cpp
+++ b/src/gromacs/gmxana/gmx_dos.cpp
@@ -45,6 +45,7 @@
 #include "gromacs/fft/fft.h"
 #include "gromacs/fileio/confio.h"
 #include "gromacs/fileio/gmxfio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"

diff --git a/src/gromacs/gmxana/gmx_order.cpp b/src/gromacs/gmxana/gmx_order.cpp
index 97f94ca08cd60128c1b137dd1d9c3bc52470ebc7..ca74942b00387a550494a2ca96b1f29664a9a3be 100644 (file)
--- a/src/gromacs/gmxana/gmx_order.cpp
+++ b/src/gromacs/gmxana/gmx_order.cpp
@@ -43,6 +43,7 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/cmat.h"

diff --git a/src/gromacs/gmxana/gmx_spatial.cpp b/src/gromacs/gmxana/gmx_spatial.cpp
index 69b6eeb8f5ca3c5f94de4f6e2b09d55dfab70855..60412f2544634dc124e4f40b86d848dc796063f2 100644 (file)
--- a/src/gromacs/gmxana/gmx_spatial.cpp
+++ b/src/gromacs/gmxana/gmx_spatial.cpp
@@ -39,6 +39,7 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/gmxana/gmx_ana.h"
 #include "gromacs/legacyheaders/macros.h"

diff --git a/src/gromacs/gmxana/gmx_tcaf.cpp b/src/gromacs/gmxana/gmx_tcaf.cpp
index 323c20d86242f539febbfbf6279f989bd315c714..ad198b1b7d42555156c17f7bf17c097509ad21bb 100644 (file)
--- a/src/gromacs/gmxana/gmx_tcaf.cpp
+++ b/src/gromacs/gmxana/gmx_tcaf.cpp
@@ -44,6 +44,7 @@
 #include "gromacs/correlationfunctions/autocorr.h"
 #include "gromacs/correlationfunctions/expfit.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"

diff --git a/src/gromacs/gmxana/gmx_traj.cpp b/src/gromacs/gmxana/gmx_traj.cpp
index 507aa5351381a79fbf5159660b7bfdd09c71ba2a..3b93110002346d324058794d041038a37b5a2cf5 100644 (file)
--- a/src/gromacs/gmxana/gmx_traj.cpp
+++ b/src/gromacs/gmxana/gmx_traj.cpp
@@ -44,6 +44,7 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"

diff --git a/src/gromacs/gmxana/gmx_trjcat.cpp b/src/gromacs/gmxana/gmx_trjcat.cpp
index 1ddc5ca074d3c8460b112e0f3788e4ea328fa6ae..30c65551cebdd6e60fa41a852c2f68b5b1caedc3 100644 (file)
--- a/src/gromacs/gmxana/gmx_trjcat.cpp
+++ b/src/gromacs/gmxana/gmx_trjcat.cpp
@@ -48,6 +48,7 @@
 #include "gromacs/fileio/pdbio.h"
 #include "gromacs/fileio/tngio.h"
 #include "gromacs/fileio/tngio_for_tools.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xtcio.h"
 #include "gromacs/fileio/xvgr.h"

diff --git a/src/gromacs/gmxana/gmx_trjconv.cpp b/src/gromacs/gmxana/gmx_trjconv.cpp
index 20640aac80636e99686ac139cef037ad8b8b6570..5e02c927c4b331e5dfcfc8a3a3ca9caaefefba26 100644 (file)
--- a/src/gromacs/gmxana/gmx_trjconv.cpp
+++ b/src/gromacs/gmxana/gmx_trjconv.cpp
@@ -51,6 +51,7 @@
 #include "gromacs/fileio/tngio_for_tools.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trrio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xtcio.h"
 #include "gromacs/fileio/xvgr.h"

diff --git a/src/gromacs/gmxana/gmx_trjorder.cpp b/src/gromacs/gmxana/gmx_trjorder.cpp
index 675aff899a0c543ed9bc8d70f36328ed7372c306..caf9654f8299c82f35cfee3bb92148db512fe607 100644 (file)
--- a/src/gromacs/gmxana/gmx_trjorder.cpp
+++ b/src/gromacs/gmxana/gmx_trjorder.cpp
@@ -42,6 +42,7 @@
 
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"

diff --git a/src/gromacs/gmxana/gmx_velacc.cpp b/src/gromacs/gmxana/gmx_velacc.cpp
index df1a9c60afe16af1cd328ec13ae50c6b33d4db3c..98af5aae6b2320c0294d26c7dfed469e844240a0 100644 (file)
--- a/src/gromacs/gmxana/gmx_velacc.cpp
+++ b/src/gromacs/gmxana/gmx_velacc.cpp
@@ -44,6 +44,7 @@
 #include "gromacs/correlationfunctions/autocorr.h"
 #include "gromacs/fft/fft.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxana/gmx_ana.h"

diff --git a/src/gromacs/gmxana/sfactor.cpp b/src/gromacs/gmxana/sfactor.cpp
index 288f50b177c88b083fef475e3d872f26bfeea876..e960bff183f2837174e29f292fe2bc86980c5610 100644 (file)
--- a/src/gromacs/gmxana/sfactor.cpp
+++ b/src/gromacs/gmxana/sfactor.cpp
@@ -45,6 +45,7 @@
 
 #include "gromacs/fileio/confio.h"
 #include "gromacs/fileio/strdb.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/legacyheaders/macros.h"

diff --git a/src/gromacs/gmxlib/checkpoint.cpp b/src/gromacs/gmxlib/checkpoint.cpp
index 4f3634d5f7f4771116c818bec7e8e3c50b19f4bd..8c57fa2e38cf8f0fc4b4b001c179f1f0e71714ef 100644 (file)
--- a/src/gromacs/gmxlib/checkpoint.cpp
+++ b/src/gromacs/gmxlib/checkpoint.cpp
@@ -55,6 +55,7 @@
 #include "gromacs/fileio/filenm.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/gmxfio-xdr.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/xdr_datatype.h"
 #include "gromacs/fileio/xdrf.h"
 #include "gromacs/legacyheaders/copyrite.h"

diff --git a/src/gromacs/gmxpreprocess/grompp.cpp b/src/gromacs/gmxpreprocess/grompp.cpp
index d24414aec9d99885a330f520ca2fa64b66575656..f77a455f0c1eef3533ebb501e9a98a00ca245928 100644 (file)
--- a/src/gromacs/gmxpreprocess/grompp.cpp
+++ b/src/gromacs/gmxpreprocess/grompp.cpp
@@ -52,6 +52,7 @@
 #include "gromacs/fileio/confio.h"
 #include "gromacs/fileio/enxio.h"
 #include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/gmxpreprocess/add_par.h"
 #include "gromacs/gmxpreprocess/convparm.h"

diff --git a/src/gromacs/legacyheaders/checkpoint.h b/src/gromacs/legacyheaders/checkpoint.h
index dfe40adafdb4a9642b759cb91b07c9b864b7dfa0..9715075eb22c3ee1b92b942ccf5f094f5c547ad1 100644 (file)
--- a/src/gromacs/legacyheaders/checkpoint.h
+++ b/src/gromacs/legacyheaders/checkpoint.h
@@ -47,6 +47,7 @@ extern "C" {
 
 struct gmx_file_position_t;
 struct t_fileio;
+struct t_trxframe;
 
 /* the name of the environment variable to disable fsync failure checks with */
 #define GMX_IGNORE_FSYNC_FAILURE_ENV "GMX_IGNORE_FSYNC_FAILURE"

diff --git a/src/gromacs/legacyheaders/md_support.h b/src/gromacs/legacyheaders/md_support.h
index 8653d08597e014ced7c7113a8a9971e21f8e0258..99fcadbc5506f0c5548d5a06feda45286f658928 100644 (file)
--- a/src/gromacs/legacyheaders/md_support.h
+++ b/src/gromacs/legacyheaders/md_support.h
@@ -48,6 +48,7 @@ extern "C" {
 #endif
 
 struct gmx_signalling_t;
+struct t_trxframe;
 
 /* Define a number of flags to better control the information
  * passed to compute_globals in md.c and global_stat.

diff --git a/src/gromacs/legacyheaders/typedefs.h b/src/gromacs/legacyheaders/typedefs.h
index ad79e254bdc3ddcdbf1f9f2d7d84ccbc180cc382..7e599a0961a26b3b3bb0f4d46aa874d33a4fea60 100644 (file)
--- a/src/gromacs/legacyheaders/typedefs.h
+++ b/src/gromacs/legacyheaders/typedefs.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015, 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.
@@ -44,7 +44,6 @@
 
 #include <sys/types.h>
 
-#include "gromacs/fileio/trx.h"
 #include "gromacs/legacyheaders/types/commrec_fwd.h"
 #include "gromacs/legacyheaders/types/constr.h"
 #include "gromacs/legacyheaders/types/energy.h"

diff --git a/src/gromacs/mdlib/forcerec.cpp b/src/gromacs/mdlib/forcerec.cpp
index 020bccc0b15d31b684294b98201ef9e2c8e8f0e5..6adff8903e17c1bd679cb0d32c1898aebeec6a5b 100644 (file)
--- a/src/gromacs/mdlib/forcerec.cpp
+++ b/src/gromacs/mdlib/forcerec.cpp
@@ -49,6 +49,7 @@
 
 #include "gromacs/domdec/domdec.h"
 #include "gromacs/ewald/ewald.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 #include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/force.h"

diff --git a/src/gromacs/mdlib/md_support.cpp b/src/gromacs/mdlib/md_support.cpp
index 600035ce3a2a8ea03b93a6f9e729ca81d795c15d..8d483e4ae541a583d2556a6370f0564da9df78cc 100644 (file)
--- a/src/gromacs/mdlib/md_support.cpp
+++ b/src/gromacs/mdlib/md_support.cpp
@@ -42,6 +42,7 @@
 #include <algorithm>
 
 #include "gromacs/domdec/domdec.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/legacyheaders/md_logging.h"
 #include "gromacs/legacyheaders/mdrun.h"

diff --git a/src/gromacs/mdlib/tpi.cpp b/src/gromacs/mdlib/tpi.cpp
index 7ca2eeae92c7f530b0d76c365a11a851df505520..2e6f9ac40be09169b22e2f61c820042f7bf3183e 100644 (file)
--- a/src/gromacs/mdlib/tpi.cpp
+++ b/src/gromacs/mdlib/tpi.cpp
@@ -46,6 +46,7 @@
 #include "gromacs/domdec/domdec.h"
 #include "gromacs/ewald/pme.h"
 #include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/gmxlib/conformation-utilities.h"

diff --git a/src/gromacs/tools/check.cpp b/src/gromacs/tools/check.cpp
index d9500c1af4528bf96c15293da13946a2f1cab66d..f2e947f63b6a84fddba6c90cd136822b38247f55 100644 (file)
--- a/src/gromacs/tools/check.cpp
+++ b/src/gromacs/tools/check.cpp
@@ -45,6 +45,7 @@
 #include "gromacs/fileio/enxio.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/fileio/xtcio.h"
 #include "gromacs/legacyheaders/macros.h"

diff --git a/src/gromacs/tools/compare.cpp b/src/gromacs/tools/compare.cpp
index 2bf593ed3bc350cc98f62ee1326d1582295b9bdc..948bfe860e338d5d32bb8e9c4f08ac34945804f0 100644 (file)
--- a/src/gromacs/tools/compare.cpp
+++ b/src/gromacs/tools/compare.cpp
@@ -46,6 +46,7 @@
 
 #include "gromacs/fileio/enxio.h"
 #include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/legacyheaders/names.h"

diff --git a/src/gromacs/tools/dump.cpp b/src/gromacs/tools/dump.cpp
index a29d72e7268ebf9a8eb6f825e9c2860e6689b547..699308d5b6f927122a256cdd3f15ce0e816ef0c6 100644 (file)
--- a/src/gromacs/tools/dump.cpp
+++ b/src/gromacs/tools/dump.cpp
@@ -51,6 +51,7 @@
 #include "gromacs/fileio/tngio_for_tools.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trrio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/fileio/xtcio.h"
 #include "gromacs/gmxpreprocess/gmxcpp.h"
 #include "gromacs/legacyheaders/checkpoint.h"

diff --git a/src/programs/mdrun/runner.cpp b/src/programs/mdrun/runner.cpp
index 01191b1f9d3a51ef278be14efc66ab851a1199ef..502b2a72be3f21ea38ce11ee50368dbf4c1fd3bf 100644 (file)
--- a/src/programs/mdrun/runner.cpp
+++ b/src/programs/mdrun/runner.cpp
@@ -50,6 +50,7 @@
 #include "gromacs/essentialdynamics/edsam.h"
 #include "gromacs/ewald/pme.h"
 #include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/gmxlib/gpu_utils/gpu_utils.h"
 #include "gromacs/legacyheaders/checkpoint.h"
 #include "gromacs/legacyheaders/constr.h"

diff --git a/src/programs/view/view.cpp b/src/programs/view/view.cpp
index 0cf68b2b1ecd17c2f1a8c880e8dc0ed619d07c1d..662ce57787db22efd7b26948757ea6fa9bb73bde 100644 (file)
--- a/src/programs/view/view.cpp
+++ b/src/programs/view/view.cpp
@@ -44,6 +44,7 @@
 #include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/confio.h"
 #include "gromacs/fileio/tpxio.h"
+#include "gromacs/fileio/trx.h"
 #include "gromacs/legacyheaders/copyrite.h"
 #include "gromacs/legacyheaders/macros.h"
 #include "gromacs/legacyheaders/typedefs.h"