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
0ede850d
Commit
0ede850d
authored
13 years ago
by
Janik Zikovsky
Browse files
Options
Downloads
Patches
Plain Diff
Refs #2897: Fix test build, warnings.
parent
2e06eb98
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/API/src/ParameterReference.cpp
+1
-1
1 addition, 1 deletion
Code/Mantid/Framework/API/src/ParameterReference.cpp
Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
+6
-6
6 additions, 6 deletions
Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
with
7 additions
and
7 deletions
Code/Mantid/Framework/API/src/ParameterReference.cpp
+
1
−
1
View file @
0ede850d
...
...
@@ -36,7 +36,7 @@ void ParameterReference::reset(IFitFunction* fun, size_t index)
CompositeFunction
*
cf
=
dynamic_cast
<
CompositeFunction
*>
(
fun
);
while
(
cf
)
{
int
iFun
=
cf
->
functionIndex
(
iLocal
);
// TODO squashing the warning breaks the code
int
iFun
=
static_cast
<
int
>
(
cf
->
functionIndex
(
iLocal
)
)
;
// TODO squashing the warning breaks the code
fLocal
=
cf
->
getFunction
(
iFun
);
iLocal
=
fLocal
->
parameterIndex
(
cf
->
parameterLocalName
(
iLocal
));
cf
=
dynamic_cast
<
CompositeFunction
*>
(
fLocal
);
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
+
6
−
6
View file @
0ede850d
...
...
@@ -51,12 +51,12 @@ public:
//checking the level - this should be set to debug in the config file
//therefore this should only return false for debug
TS_ASSERT
(
log1
.
is
(
Log
ge
r
::
PRIO_DEBUG
)
==
false
);
//debug
TS_ASSERT
(
log1
.
is
(
Log
ge
r
::
PRIO_INFORMATION
));
//information
TS_ASSERT
(
log1
.
is
(
Log
ge
r
::
PRIO_NOTICE
));
//information
TS_ASSERT
(
log1
.
is
(
Log
ge
r
::
PRIO_WARNING
));
//warning
TS_ASSERT
(
log1
.
is
(
Log
ge
r
::
PRIO_ERROR
));
//error
TS_ASSERT
(
log1
.
is
(
Log
ge
r
::
PRIO_FATAL
));
//fatal
TS_ASSERT
(
log1
.
is
(
Poco
::
Messa
ge
::
PRIO_DEBUG
)
==
false
);
//debug
TS_ASSERT
(
log1
.
is
(
Poco
::
Messa
ge
::
PRIO_INFORMATION
));
//information
TS_ASSERT
(
log1
.
is
(
Poco
::
Messa
ge
::
PRIO_NOTICE
));
//information
TS_ASSERT
(
log1
.
is
(
Poco
::
Messa
ge
::
PRIO_WARNING
));
//warning
TS_ASSERT
(
log1
.
is
(
Poco
::
Messa
ge
::
PRIO_ERROR
));
//error
TS_ASSERT
(
log1
.
is
(
Poco
::
Messa
ge
::
PRIO_FATAL
));
//fatal
}
void
testEnabled
()
...
...
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