From 87a050b2acbbe8d4c48e48ec22d7ee093c7544ab Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Mon, 18 Dec 2006 16:21:29 +0000
Subject: [PATCH] BugID: 61
Removal of #include <Common/StringUtil.h> from LofarLogge.rh caused so much
trouble, that I decided it was not worth the trouble to keep this change, so I
reverted the change.
---
LCS/Common/include/Common/LofarLog4Cplus.h | 8 +++-----
LCS/Common/include/Common/LofarLogCout.h | 4 +---
LCS/Common/include/Common/LofarLogger.h | 7 +++++--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/LCS/Common/include/Common/LofarLog4Cplus.h b/LCS/Common/include/Common/LofarLog4Cplus.h
index 58b020b9d72..9ea702ff8e6 100644
--- a/LCS/Common/include/Common/LofarLog4Cplus.h
+++ b/LCS/Common/include/Common/LofarLog4Cplus.h
@@ -26,18 +26,16 @@
// \file
// Interface to the log4cplus logging package.
-//# Includes
+//# Never #include <config.h> or #include <lofar_config.h> in a header file!
#include <Common/lofar_iostream.h>
#include <Common/lofar_string.h>
#include <Common/Exception.h>
+
+//# Includes
#include <log4cplus/logger.h>
#include <log4cplus/configurator.h>
#include <log4cplus/global-init.h>
-#ifdef ENABLE_TRACER
-# include <Common/StringUtil.h>
-#endif
-
namespace LOFAR {
// \ingroup Common
diff --git a/LCS/Common/include/Common/LofarLogCout.h b/LCS/Common/include/Common/LofarLogCout.h
index 51b8fe1edda..48e3924b313 100644
--- a/LCS/Common/include/Common/LofarLogCout.h
+++ b/LCS/Common/include/Common/LofarLogCout.h
@@ -32,10 +32,8 @@
#include <Common/lofar_string.h>
#include <Common/lofar_map.h>
#include <Common/Exception.h>
-
#ifdef ENABLE_LATENCY_STATS
-# include <Common/StringUtil.h>
-# include <sys/time.h>
+#include <sys/time.h>
#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/LCS/Common/include/Common/LofarLogger.h b/LCS/Common/include/Common/LofarLogger.h
index 2c039dc7b17..ecac7452257 100644
--- a/LCS/Common/include/Common/LofarLogger.h
+++ b/LCS/Common/include/Common/LofarLogger.h
@@ -26,8 +26,11 @@
// \file
// Macro interface to the lofar logging package.
-//# Depending of the availability of the log4Cplus package one set of macros
-//# or the other set of macros is included.
+//# Never #include <config.h> or #include <lofar_config.h> in a header file!
+#include <Common/StringUtil.h>
+
+//# Dependent of the availability of the log4Cplus package one set of macro's
+//# or the other set of macro's is included.
#ifdef HAVE_LOG4CPLUS
# include <Common/LofarLog4Cplus.h>
#else
--
GitLab