Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
4c6ac566
Commit
4c6ac566
authored
5 years ago
by
Sam Jenkins
Browse files
Options
Downloads
Patches
Plain Diff
Re #25465 Removed raw owning pointers from nexus descriptor
parent
2217a851
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Kernel/inc/MantidKernel/NexusDescriptor.h
+2
-1
2 additions, 1 deletion
Framework/Kernel/inc/MantidKernel/NexusDescriptor.h
Framework/Kernel/src/NexusDescriptor.cpp
+2
-2
2 additions, 2 deletions
Framework/Kernel/src/NexusDescriptor.cpp
with
4 additions
and
3 deletions
Framework/Kernel/inc/MantidKernel/NexusDescriptor.h
+
2
−
1
View file @
4c6ac566
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
#include
<string>
#include
<string>
#include
<unordered_set>
#include
<unordered_set>
#include
<utility>
#include
<utility>
#include
<memory>
namespace
NeXus
{
namespace
NeXus
{
class
File
;
class
File
;
...
@@ -110,7 +111,7 @@ private:
...
@@ -110,7 +111,7 @@ private:
std
::
map
<
std
::
string
,
std
::
string
>
m_pathsToTypes
;
std
::
map
<
std
::
string
,
std
::
string
>
m_pathsToTypes
;
/// Open NeXus handle
/// Open NeXus handle
::
NeXus
::
File
*
m_file
;
std
::
unique_ptr
<
::
NeXus
::
File
>
m_file
;
};
};
}
// namespace Kernel
}
// namespace Kernel
...
...
This diff is collapsed.
Click to expand it.
Framework/Kernel/src/NexusDescriptor.cpp
+
2
−
2
View file @
4c6ac566
...
@@ -142,7 +142,7 @@ NexusDescriptor::NexusDescriptor(const std::string &filename)
...
@@ -142,7 +142,7 @@ NexusDescriptor::NexusDescriptor(const std::string &filename)
/**
/**
*/
*/
NexusDescriptor
::~
NexusDescriptor
()
{
delete
m_file
;
}
NexusDescriptor
::~
NexusDescriptor
()
{}
/// Returns the name & type of the first entry in the file
/// Returns the name & type of the first entry in the file
const
std
::
pair
<
std
::
string
,
std
::
string
>
&
const
std
::
pair
<
std
::
string
,
std
::
string
>
&
...
@@ -220,7 +220,7 @@ void NexusDescriptor::initialize(const std::string &filename) {
...
@@ -220,7 +220,7 @@ void NexusDescriptor::initialize(const std::string &filename) {
m_filename
=
filename
;
m_filename
=
filename
;
m_extension
=
"."
+
Poco
::
Path
(
filename
).
getExtension
();
m_extension
=
"."
+
Poco
::
Path
(
filename
).
getExtension
();
m_file
=
new
::
NeXus
::
File
(
this
->
filename
());
m_file
=
std
::
make_unique
<
::
NeXus
::
File
>
(
this
->
filename
());
m_file
->
openPath
(
"/"
);
m_file
->
openPath
(
"/"
);
m_rootAttrs
.
clear
();
m_rootAttrs
.
clear
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment