Replace scoped_cptr with unique_cptr

[alexxy/gromacs.git] / src / gromacs / gpu_utils / ocl_caching.cpp

diff --git a/src/gromacs/gpu_utils/ocl_caching.cpp b/src/gromacs/gpu_utils/ocl_caching.cpp
index d48fdb5de4ba6785f412efe10abd6d7851c922ee..a5046265e88d736bf3c78316026e7ccea2b72d14 100644 (file)
--- a/src/gromacs/gpu_utils/ocl_caching.cpp
+++ b/src/gromacs/gpu_utils/ocl_caching.cpp
@@ -58,22 +58,22 @@
 
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/programcontext.h"
-#include "gromacs/utility/scoped_cptr.h"
 #include "gromacs/utility/smalloc.h"
 #include "gromacs/utility/stringutil.h"
 #include "gromacs/utility/textreader.h"
+#include "gromacs/utility/unique_cptr.h"
 
 namespace gmx
 {
 namespace ocl
 {
 
-/*! \brief RAII helper to use with scoped_cptr
+/*! \brief RAII helper to use with unique_cptr
  *
  * Can't use fclose because the template requires a function that
  * returns void.
  *
- * \todo Either generalise scoped_cptr somehow, or (better) make
+ * \todo Either generalise unique_cptr somehow, or (better) make
  * general infrastructure for reading and writing binary lumps.
  * Neither of these is a priority while JIT caching is inactive.
  */
@@ -120,7 +120,7 @@ makeProgramFromCache(const std::string &filename,
 {
     // TODO all this file reading stuff should become gmx::BinaryReader
     FILE *f = fopen(filename.c_str(), "rb");
-    scoped_cptr<FILE, fclose_wrapper> fileGuard(f);
+    const unique_cptr<FILE, fclose_wrapper> fileGuard(f);
     if (!f)
     {
         GMX_THROW(FileIOError("Failed to open binary cache file " + filename));
@@ -129,7 +129,7 @@ makeProgramFromCache(const std::string &filename,
     // TODO more stdio error handling
     fseek(f, 0, SEEK_END);
     unsigned char             *binary;
-    scoped_cptr<unsigned char> binaryGuard;
+    unique_cptr<unsigned char> binaryGuard;
     size_t                     fileSize = ftell(f);
     snew(binary, fileSize);
     binaryGuard.reset(binary);
@@ -176,9 +176,9 @@ writeBinaryToCache(cl_program program, const std::string &filename)
     }
 
     // TODO all this file writing stuff should become gmx::BinaryWriter
-    unsigned char             *binary;
+    unsigned char                   *binary;
     snew(binary, fileSize);
-    scoped_cptr<unsigned char> binaryGuard(binary);
+    const unique_cptr<unsigned char> binaryGuard(binary);
 
     cl_error = clGetProgramInfo(program, CL_PROGRAM_BINARIES, sizeof(binary), &binary, NULL);
     if (cl_error != CL_SUCCESS)
@@ -187,7 +187,7 @@ writeBinaryToCache(cl_program program, const std::string &filename)
     }
 
     FILE *f = fopen(filename.c_str(), "wb");
-    scoped_cptr<FILE, fclose_wrapper> fileGuard(f);
+    const unique_cptr<FILE, fclose_wrapper> fileGuard(f);
     if (!f)
     {
         GMX_THROW(FileIOError("Failed to open binary cache file " + filename));