change deleter scope

Author: cducher

src/nwp_emulator/grib_file_reader.cc

@@ -10,8 +10,8 @@
  */
 #include <algorithm>
 #include <cstring>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 #include <typeinfo>
 
 #include "eckit/exception/Exceptions.h"
@@ -22,6 +22,18 @@
 #include "nwp_definitions.h"
 
 namespace nwp_emulator {
+void codesHandleDeleter::operator()(codes_handle* h) {
+    if (h) {
+        codes_handle_delete(h);
+    }
+}
+
+void fileDeleter::operator()(FILE* f) {
+    if (f) {
+        fclose(f);
+    }
+}
+
 GRIBFileReader::GRIBFileReader(const eckit::PathName& inputPath, size_t rank, size_t root, int stepCountLimit) :
     rank_(rank), root_(root), DataReader(stepCountLimit) {
     if (rank_ != root_) {
@@ -44,10 +56,10 @@ GRIBFileReader::GRIBFileReader(const eckit::PathName& inputPath, size_t rank, si
     // 2. Field names & metadata (parameters)
     std::string paramBuffer;
     if (rank_ == root_) {
-        for (const auto& param: params_) {
+        for (const auto& param : params_) {
             paramBuffer += param + ";";
         }
-        paramBuffer.pop_back(); // remove last ';' separator
+        paramBuffer.pop_back();  // remove last ';' separator
     }
     size_t paramSize = paramBuffer.size();
     eckit::mpi::comm().broadcast(paramSize, root_);
@@ -169,8 +181,8 @@ void GRIBFileReader::validateSrcFiles(bool isRoot) {
         for (int i = 0; i < count_ - 1; ++i) {
             readMsgMetadata(gridName, paramMd);
             if (gridName != gridName_) {
-                eckit::Log::error() << "Grid in " << filename << " is different from setup ("
-                                    << gridName_ << "), exit..." << std::endl;
+                eckit::Log::error() << "Grid in " << filename << " is different from setup (" << gridName_
+                                    << "), exit..." << std::endl;
                 eckit::mpi::comm().abort(1);
             }
             fileParams.push_back(paramMd);
@@ -179,10 +191,10 @@ void GRIBFileReader::validateSrcFiles(bool isRoot) {
                 eckit::mpi::comm().abort(1);
             }
         }
-        readMsgMetadata(gridName, paramMd); // read the last message in the file
+        readMsgMetadata(gridName, paramMd);  // read the last message in the file
         if (gridName != gridName_) {
-            eckit::Log::error() << "Grid in " << filename << " is different from setup ("
-                                << gridName_ << "), exit..." << std::endl;
+            eckit::Log::error() << "Grid in " << filename << " is different from setup (" << gridName_ << "), exit..."
+                                << std::endl;
             eckit::mpi::comm().abort(1);
         }
         fileParams.push_back(paramMd);
@@ -314,7 +326,7 @@ bool GRIBFileReader::nextMessage(std::string& shortName, std::string& levtype, s
     ++index_;
     eckit::mpi::comm().broadcast(count_, root_);
     if (rank_ == root_ && index_ < count_) {
-        return resetGribHandle(); // Load the next message
+        return resetGribHandle();  // Load the next message
     }
     return true;
 }

src/nwp_emulator/grib_file_reader.h

@@ -10,37 +10,36 @@
  */
 #pragma once
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <cstdio>
-#include <memory>
 
 #include "eccodes.h"
 #include "eckit/filesystem/PathName.h"
 
 #include "data_reader.h"
 
+namespace nwp_emulator {
+
 /**
  * @brief A structure for a custom deleter to manage codes handles.
- * 
+ *
  * This deleter allows to use codes handles pointers as unique pointers for safer memory usage.
  */
 struct codesHandleDeleter {
-    void operator()(codes_handle* h) { if (h) {codes_handle_delete(h);} }
+    void operator()(codes_handle* h);
 };
 
 /**
  * @brief A structure for a custom deleter to manage files.
- * 
+ *
  * This deleter allows to use C-style file pointers as unique pointers for safer memory usage.
  * `std::fstream` is not compatible with eccodes, hence the need to stick to `FILE`.
  */
 struct fileDeleter {
-    void operator()(FILE* f) { if (f) {fclose(f);} }
+    void operator()(FILE* f);
 };
 
-namespace nwp_emulator {
-
 /**
  * @class GRIBFileReader
  * @brief Handles reading of GRIB data and serves them as Atlas fields. Supports parallel environments.
@@ -55,8 +54,8 @@ namespace nwp_emulator {
 class GRIBFileReader final : public DataReader {
 private:
     std::vector<eckit::PathName> srcFilenames_;
-    std::unique_ptr<FILE, fileDeleter> currentFile_{nullptr, fileDeleter()};
-    std::unique_ptr<codes_handle, codesHandleDeleter> grib_{nullptr, codesHandleDeleter()};
+    std::unique_ptr<FILE, fileDeleter> currentFile_         = nullptr;
+    std::unique_ptr<codes_handle, codesHandleDeleter> grib_ = nullptr;
 
     size_t rank_;
     size_t root_;
@@ -84,9 +83,9 @@ class GRIBFileReader final : public DataReader {
 
     /**
      * @brief Resets the GRIB handle. Decodes the next message in the current file.
-     * 
+     *
      * This method first resets the handle pointer using the deleter, making sure memory is properly deallocated.
-     * 
+     *
      * @return True if successful, false if there was an error loading the next message or if the current file
      * has had all its messages decoded already.
      */