From 4346ac74eea7693135cacafd3694f7b6eca48222 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Mon, 1 Nov 2010 17:24:37 +0000
Subject: [PATCH] Fix the tests by not outputting to stdout. Re #1791
---
Code/Mantid/Kernel/inc/MantidKernel/ConfigService.h | 8 +++-----
Code/Mantid/Kernel/src/ConfigService.cpp | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Code/Mantid/Kernel/inc/MantidKernel/ConfigService.h b/Code/Mantid/Kernel/inc/MantidKernel/ConfigService.h
index b8c0a3bec65..2d387c64be3 100644
--- a/Code/Mantid/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Code/Mantid/Kernel/inc/MantidKernel/ConfigService.h
@@ -30,11 +30,9 @@ namespace Poco
namespace Mantid
{
- /**
- * Returns the welcome message for Mantid. This is echoed to stdout by the
- * ConfigService
- */
- static std::string welcomeMessage();
+
+ /// Returns the welcome message for Mantid.
+ DLLExport std::string welcomeMessage();
namespace Kernel
{
diff --git a/Code/Mantid/Kernel/src/ConfigService.cpp b/Code/Mantid/Kernel/src/ConfigService.cpp
index ebadd55ab44..7b450a1c8fe 100644
--- a/Code/Mantid/Kernel/src/ConfigService.cpp
+++ b/Code/Mantid/Kernel/src/ConfigService.cpp
@@ -32,7 +32,8 @@
namespace Mantid
{
/**
- * Returns the welcome message for Mantid. This is echoed to stdout by the ConfigService.
+ * Get the welcome message for Mantid.
+ * @returns A string containing the welcome message for Mantid.
*/
std::string welcomeMessage()
{
@@ -186,7 +187,6 @@ ConfigServiceImpl::ConfigServiceImpl() :
g_log.debug() << "ConfigService created." << std::endl;
g_log.debug() << "Configured base directory of application as " << getBaseDir() << std::endl;
- std::cout << "\n" << Mantid::welcomeMessage() << "\n" << std::endl;
g_log.information() << "This is Mantid Version " << MANTID_VERSION << std::endl;
}
--
GitLab