Merge branch 'release-2019' into master

[alexxy/gromacs.git] / src / gromacs / ewald / tests / testhardwarecontexts.cpp

diff --git a/src/gromacs/ewald/tests/testhardwarecontexts.cpp b/src/gromacs/ewald/tests/testhardwarecontexts.cpp
index 5cbbcc311951ab6a4620288092dbdabd36c00943..e15c37c3a1f1c2eae738e2b2f7fd84c77d6e1682 100644 (file)
--- a/src/gromacs/ewald/tests/testhardwarecontexts.cpp
+++ b/src/gromacs/ewald/tests/testhardwarecontexts.cpp
@@ -44,7 +44,8 @@
 
 #include "testhardwarecontexts.h"
 
-#include "gromacs/compat/make_unique.h"
+#include <memory>
+
 #include "gromacs/ewald/pme.h"
 #include "gromacs/gpu_utils/gpu_utils.h"
 #include "gromacs/hardware/detecthardware.h"
@@ -109,7 +110,7 @@ static gmx_hw_info_t *hardwareInit()
 
 void PmeTestEnvironment::SetUp()
 {
-    hardwareContexts_.emplace_back(compat::make_unique<TestHardwareContext>(CodePath::CPU, "", nullptr));
+    hardwareContexts_.emplace_back(std::make_unique<TestHardwareContext>(CodePath::CPU, "", nullptr));
 
     hardwareInfo_ = hardwareInit();
     if (!pme_gpu_supports_build(nullptr) ||
@@ -127,7 +128,7 @@ void PmeTestEnvironment::SetUp()
         char        stmp[200] = {};
         get_gpu_device_info_string(stmp, hardwareInfo_->gpu_info, gpuIndex);
         std::string description = "(GPU " + std::string(stmp) + ") ";
-        hardwareContexts_.emplace_back(compat::make_unique<TestHardwareContext>
+        hardwareContexts_.emplace_back(std::make_unique<TestHardwareContext>
                                            (CodePath::GPU, description.c_str(),
                                            deviceInfo));
     }