Merge branch release-5-1

[alexxy/gromacs.git] / src / gromacs / correlationfunctions / tests / autocorr.cpp

diff --git a/src/gromacs/correlationfunctions/tests/autocorr.cpp b/src/gromacs/correlationfunctions/tests/autocorr.cpp
index c8ee6edfb942e1646043b3f7676c78e5e3873cc9..561ecb99e68ddaf86cf5aca407ba176884bbb05a 100644 (file)
--- a/src/gromacs/correlationfunctions/tests/autocorr.cpp
+++ b/src/gromacs/correlationfunctions/tests/autocorr.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014,2016, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015,2016, 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.
@@ -46,14 +46,14 @@
 
 #include <cmath>
 
+#include <memory>
+
 #include <gtest/gtest.h>
 
 #include "gromacs/correlationfunctions/expfit.h"
 #include "gromacs/fft/fft.h"
-#include "gromacs/legacyheaders/oenv.h"
 #include "gromacs/utility/gmxassert.h"
 #include "gromacs/utility/smalloc.h"
-#include "gromacs/utility/uniqueptr.h"
 
 #include "testutils/refdata.h"
 #include "testutils/testasserts.h"
@@ -67,7 +67,7 @@ namespace
 {
 
 //! Definition of pointer to class containing test data.
-typedef gmx_unique_ptr<CorrelationDataSet>::type CorrelationDataSetPointer;
+typedef std::unique_ptr<CorrelationDataSet> CorrelationDataSetPointer;
 
 class AutocorrTest : public ::testing::Test
 {
@@ -85,7 +85,7 @@ class AutocorrTest : public ::testing::Test
         AutocorrTest( )
             : checker_(refData_.rootChecker())
         {
-#ifdef GMX_DOUBLE
+#if GMX_DOUBLE
             checker_.setDefaultTolerance(test::relativeToleranceAsFloatingPoint(1, 1e-6));
 #else
             checker_.setDefaultTolerance(test::relativeToleranceAsFloatingPoint(1, 1e-3));