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
b91eadf3
Commit
b91eadf3
authored
9 years ago
by
Nick Draper
Browse files
Options
Downloads
Patches
Plain Diff
Fix linux nonly warnings
re #12064
parent
12e5aa38
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
Code/Mantid/Framework/DataHandling/src/CheckMantidVersion.cpp
+1
-1
1 addition, 1 deletion
.../Mantid/Framework/DataHandling/src/CheckMantidVersion.cpp
Code/Mantid/Framework/DataHandling/test/CheckMantidVersionTest.h
+4
-3
4 additions, 3 deletions
...ntid/Framework/DataHandling/test/CheckMantidVersionTest.h
with
5 additions
and
4 deletions
Code/Mantid/Framework/DataHandling/src/CheckMantidVersion.cpp
+
1
−
1
View file @
b91eadf3
...
...
@@ -175,7 +175,7 @@ bool CheckMantidVersion::isVersionMoreRecent(
auto
localVersionParts
=
splitVersionString
(
localVersion
);
auto
gitHubVersionParts
=
splitVersionString
(
gitHubVersion
);
for
(
in
t
i
=
0
;
i
<
gitHubVersionParts
.
size
();
i
++
)
{
for
(
size_
t
i
=
0
;
i
<
gitHubVersionParts
.
size
();
i
++
)
{
// sanity check
if
(
i
>=
localVersionParts
.
size
())
{
// ran out of items to compare
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Framework/DataHandling/test/CheckMantidVersionTest.h
+
4
−
3
View file @
b91eadf3
...
...
@@ -14,14 +14,15 @@ namespace {
*/
class
MockedCheckMantidVersion
:
public
CheckMantidVersion
{
public:
MockedCheckMantidVersion
(
std
::
string
currentVersion
,
std
::
string
gitHubVersion
)
:
CurrentVersion
(
currentVersion
),
GitHubVersion
(
gitHubVersion
)
,
CheckMantidVersion
()
{}
MockedCheckMantidVersion
(
std
::
string
currentVersion
,
std
::
string
gitHubVersion
)
:
CheckMantidVersion
(),
CurrentVersion
(
currentVersion
),
GitHubVersion
(
gitHubVersion
){}
std
::
string
CurrentVersion
;
std
::
string
GitHubVersion
;
private
:
virtual
std
::
string
getVersionsFromGitHub
(
const
std
::
string
&
url
)
{
std
::
string
outputString
;
//the initial assignment of the value to url is just to suppress a compiler warning
std
::
string
outputString
(
url
);
outputString
=
"{
\n
"
"
\"
url
\"
:
\"
https://api.github.com/repos/mantidproject/mantid/releases/1308203
\"
,
\n
"
"
\"
assets_url
\"
:
\"
https://api.github.com/repos/mantidproject/mantid/releases/1308203/assets
\"
,
\n
"
...
...
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