From 0ede850d0aa3f2334d3126816b08fbd13ab08918 Mon Sep 17 00:00:00 2001
From: Janik Zikovsky <zikovskyjl@ornl.gov>
Date: Fri, 27 May 2011 15:42:41 +0000
Subject: [PATCH] Refs #2897: Fix test build, warnings.
---
Code/Mantid/Framework/API/src/ParameterReference.cpp | 2 +-
.../Mantid/Framework/Kernel/test/ConfigServiceTest.h | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Code/Mantid/Framework/API/src/ParameterReference.cpp b/Code/Mantid/Framework/API/src/ParameterReference.cpp
index 3210879ba3b..52b64ea04cc 100644
--- a/Code/Mantid/Framework/API/src/ParameterReference.cpp
+++ b/Code/Mantid/Framework/API/src/ParameterReference.cpp
@@ -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);
diff --git a/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h b/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
index 9a55572cb2e..6842842181a 100644
--- a/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
+++ b/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
@@ -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(Logger::PRIO_DEBUG) == false); //debug
- TS_ASSERT(log1.is(Logger::PRIO_INFORMATION)); //information
- TS_ASSERT(log1.is(Logger::PRIO_NOTICE)); //information
- TS_ASSERT(log1.is(Logger::PRIO_WARNING)); //warning
- TS_ASSERT(log1.is(Logger::PRIO_ERROR)); //error
- TS_ASSERT(log1.is(Logger::PRIO_FATAL)); //fatal
+ TS_ASSERT(log1.is(Poco::Message::PRIO_DEBUG) == false); //debug
+ TS_ASSERT(log1.is(Poco::Message::PRIO_INFORMATION)); //information
+ TS_ASSERT(log1.is(Poco::Message::PRIO_NOTICE)); //information
+ TS_ASSERT(log1.is(Poco::Message::PRIO_WARNING)); //warning
+ TS_ASSERT(log1.is(Poco::Message::PRIO_ERROR)); //error
+ TS_ASSERT(log1.is(Poco::Message::PRIO_FATAL)); //fatal
}
void testEnabled()
--
GitLab