Replace scoped_cptr with unique_cptr

[alexxy/gromacs.git] / src / programs / mdrun / tests / trajectoryreader.h

diff --git a/src/programs/mdrun/tests/trajectoryreader.h b/src/programs/mdrun/tests/trajectoryreader.h
index a2fe2c68f9565e6d628f2c95ca302000e96f9534..9184cb141bcb25e422635da5ee815b70473858d5 100644 (file)
--- a/src/programs/mdrun/tests/trajectoryreader.h
+++ b/src/programs/mdrun/tests/trajectoryreader.h
@@ -54,7 +54,7 @@
 #include "gromacs/fileio/oenv.h"
 #include "gromacs/fileio/trxio.h"
 #include "gromacs/trajectory/trajectoryframe.h"
-#include "gromacs/utility/scoped_cptr.h"
+#include "gromacs/utility/unique_cptr.h"
 
 #include "testutils/testasserts.h"
 
@@ -70,13 +70,13 @@ namespace test
 class TrajectoryFrame;
 
 //! Convenience smart pointer typedef
-typedef scoped_cptr<gmx_output_env_t, output_env_done> oenv_ptr;
+typedef unique_cptr<gmx_output_env_t, output_env_done> oenv_ptr;
 //! Convenience smart pointer typedef
-typedef scoped_cptr<t_trxstatus, close_trx> trxstatus_file_ptr;
+typedef unique_cptr<t_trxstatus, close_trx> trxstatus_file_ptr;
 //! Helper function to free all resources
 void done_trxframe(t_trxframe *fr);
 //! Convenience smart pointer typedef
-typedef scoped_cptr<t_trxframe, done_trxframe> trxframe_ptr;
+typedef unique_cptr<t_trxframe, done_trxframe> trxframe_ptr;
 
 /*! \internal
  * \brief Manages returning a t_trxframe whose contents were read from
@@ -125,7 +125,7 @@ class TrajectoryFrameReader
         //! Owning handle of an open trajectory file ready to read frames.
         trxstatus_file_ptr trajectoryFileGuard_;
         //! Owning handle of contents of trajectory file frame after reading.
-        trxframe_ptr       trxframeGuard_;
+        const trxframe_ptr trxframeGuard_;
         //! Whether the first frame has been read
         bool               haveReadFirstFrame_;
         //! Whether the API has been used properly (ie. probe before reading).