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
7d9cb0f7
Commit
7d9cb0f7
authored
13 years ago
by
Russell Taylor
Browse files
Options
Downloads
Patches
Plain Diff
Eliminate a ubiquitous Intel compiler warning. Re #3302.
parent
efa17c20
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmFactory.h
+4
-3
4 additions, 3 deletions
Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmFactory.h
Code/Mantid/Framework/API/src/AlgorithmFactory.cpp
+14
-0
14 additions, 0 deletions
Code/Mantid/Framework/API/src/AlgorithmFactory.cpp
with
18 additions
and
3 deletions
Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmFactory.h
+
4
−
3
View file @
7d9cb0f7
...
...
@@ -39,7 +39,7 @@ class CloneableAlgorithm;
@author Russell Taylor, Tessella Support Services plc
@date 21/09/2007
Copyright © 2007-201
0
ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
Copyright © 2007-201
1
ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
This file is part of Mantid.
...
...
@@ -95,8 +95,9 @@ public:
}
}
///Get the algorithm names and version - mangled use decodeName to seperate
const
std
::
vector
<
std
::
string
>
getKeys
(
bool
includeHidden
=
false
)
const
;
/// Get the algorithm names and version - mangled use decodeName to separate
const
std
::
vector
<
std
::
string
>
getKeys
()
const
;
const
std
::
vector
<
std
::
string
>
getKeys
(
bool
includeHidden
)
const
;
///Get the algorithm categories
const
std
::
set
<
std
::
string
>
getCategories
(
bool
includeHidden
=
false
)
const
;
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Framework/API/src/AlgorithmFactory.cpp
+
14
−
0
View file @
7d9cb0f7
...
...
@@ -100,6 +100,20 @@ namespace Mantid
}
}
/** Return the keys used for identifying algorithms. This includes those within the Factory itself and
* any cleanly constructed algorithms stored here.
* Hidden algorithms are excluded.
* @returns The strings used to identify individual algorithms
*/
const
std
::
vector
<
std
::
string
>
AlgorithmFactoryImpl
::
getKeys
()
const
{
/* We have a separate method rather than just a default argument value
to the getKeys(bool) methods so as to avoid an intel compiler warning. */
// Just call the 'other' getKeys method with the flag set to false
return
getKeys
(
false
);
}
/**
* Return the keys used for identifying algorithms. This includes those within the Factory itself and
* any cleanly constructed algorithms stored here.
...
...
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