Replace compat::make_unique with std::make_unique

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_awh.cpp

diff --git a/src/gromacs/gmxana/gmx_awh.cpp b/src/gromacs/gmxana/gmx_awh.cpp
index dd1d4683617f8edaf0e19f836e3dc84a0ed1cd71..e17343a925c27345dbf6b057b9ec4e12f161c4ba 100644 (file)
--- a/src/gromacs/gmxana/gmx_awh.cpp
+++ b/src/gromacs/gmxana/gmx_awh.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,2017,2018,2019, 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.
@@ -52,7 +52,6 @@
 #include <string>
 
 #include "gromacs/commandline/pargs.h"
-#include "gromacs/compat/make_unique.h"
 #include "gromacs/fileio/enxio.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/oenv.h"
@@ -440,7 +439,7 @@ AwhReader::AwhReader(const AwhParams  *awhParams,
         std::unique_ptr<OutputFile> frictionOutputFile;
         if (outputFriction)
         {
-            frictionOutputFile = gmx::compat::make_unique<OutputFile>(opt2fn("-fric", numFileOptions, filenames), "Friction tensor", awhParams->numBias, k);
+            frictionOutputFile = std::make_unique<OutputFile>(opt2fn("-fric", numFileOptions, filenames), "Friction tensor", awhParams->numBias, k);
 
             frictionOutputFile->initializeFrictionOutputFile(subblockStart, numSubBlocks, awhBiasParams, energyUnit, kT);
         }
@@ -640,11 +639,11 @@ int gmx_awh(int argc, char *argv[])
                 AwhGraphSelection awhGraphSelection = (moreGraphs ? AwhGraphSelection::All : AwhGraphSelection::Pmf);
                 EnergyUnit        energyUnit        = (kTUnit ? EnergyUnit::KT : EnergyUnit::KJPerMol);
                 awhReader =
-                    gmx::compat::make_unique<AwhReader>(ir.awhParams,
-                                                        nfile, fnm,
-                                                        awhGraphSelection,
-                                                        energyUnit, BOLTZ*ir.opts.ref_t[0],
-                                                        block);
+                    std::make_unique<AwhReader>(ir.awhParams,
+                                                nfile, fnm,
+                                                awhGraphSelection,
+                                                energyUnit, BOLTZ*ir.opts.ref_t[0],
+                                                block);
             }
 
             awhReader->processAwhFrame(*block, frame->t, oenv);