Raw -> Smart Pointers in PNeXus.

This commit is contained in:
2023-10-25 17:52:24 +02:00
parent 1cb0cfd3e7
commit 8f4a7c6b68
2 changed files with 15 additions and 32 deletions

View File

@@ -32,6 +32,7 @@
#include <string>
#include <vector>
#include <memory>
#include "napi.h"
@@ -574,8 +575,8 @@ class PNeXus {
virtual void SetFileName(std::string name) { fFileName = name; }
virtual void SetFileTime(std::string time) { fFileTime = time; }
virtual PNeXusEntry1* GetEntryIdf1() { return fNxEntry1; }
virtual PNeXusEntry2* GetEntryIdf2() { return fNxEntry2; }
virtual PNeXusEntry1* GetEntryIdf1() { return fNxEntry1.get(); }
virtual PNeXusEntry2* GetEntryIdf2() { return fNxEntry2.get(); }
virtual bool IsValid(bool strict=false);
virtual int GetErrorCode() { return fErrorCode; }
@@ -605,8 +606,8 @@ class PNeXus {
std::string fCreator; ///< facility of program where the file originated
PNeXusEntry1 *fNxEntry1; ///< NXentry for IDF 1
PNeXusEntry2 *fNxEntry2; ///< NXentry for IDF 2
std::unique_ptr<PNeXusEntry1> fNxEntry1; ///< NXentry for IDF 1
std::unique_ptr<PNeXusEntry2> fNxEntry2; ///< NXentry for IDF 2
std::vector< std::vector<unsigned int> > fGroupedHisto;