From 2d80eb39b3b0e56f2c27ca8d852d355ea464c3cd Mon Sep 17 00:00:00 2001
From: dehnert <dehnert@cs.rwth-aachen.de>
Date: Sun, 25 Nov 2012 21:10:43 +0100
Subject: [PATCH] Changed logging format and minor formatting fix.
---
src/mrmc.cpp | 2 +-
src/sparse/static_sparse_matrix.h | 3 +--
test/mrmc-tests.cpp | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/mrmc.cpp b/src/mrmc.cpp
index 96557953f..720dfba48 100644
--- a/src/mrmc.cpp
+++ b/src/mrmc.cpp
@@ -39,7 +39,7 @@ log4cplus::Logger logger;
void setUpLogging() {
log4cplus::SharedAppenderPtr fileLogAppender(new log4cplus::FileAppender("mrmc.log"));
fileLogAppender->setName("mainFileAppender");
- fileLogAppender->setLayout(std::auto_ptr<log4cplus::Layout>(new log4cplus::PatternLayout("%-5p - %D{%H:%M:%s} (%r ms) - %F:%L : %m%n")));
+ fileLogAppender->setLayout(std::auto_ptr<log4cplus::Layout>(new log4cplus::PatternLayout("%-5p - %D{%H:%M} (%r ms) - %F:%L : %m%n")));
logger = log4cplus::Logger::getInstance("mainLogger");
logger.addAppender(fileLogAppender);
diff --git a/src/sparse/static_sparse_matrix.h b/src/sparse/static_sparse_matrix.h
index 28024ca0a..ea0f0a59f 100644
--- a/src/sparse/static_sparse_matrix.h
+++ b/src/sparse/static_sparse_matrix.h
@@ -11,12 +11,11 @@
#include "src/exceptions/file_IO_exception.h"
#include "src/misc/const_templates.h"
+#include "Eigen/Sparse"
#include "log4cplus/logger.h"
#include "log4cplus/loggingmacros.h"
-#include "Eigen/Sparse"
-
extern log4cplus::Logger logger;
namespace mrmc {
diff --git a/test/mrmc-tests.cpp b/test/mrmc-tests.cpp
index 6e599da9b..323cbab83 100644
--- a/test/mrmc-tests.cpp
+++ b/test/mrmc-tests.cpp
@@ -14,7 +14,7 @@ log4cplus::Logger logger;
void setUpLogging() {
log4cplus::SharedAppenderPtr fileLogAppender(new log4cplus::FileAppender("mrmc-tests.log"));
fileLogAppender->setName("mainFileAppender");
- fileLogAppender->setLayout(std::auto_ptr<log4cplus::Layout>(new log4cplus::PatternLayout("%-5p - %D{%H:%M:%s} (%r ms) - %F:%L : %m%n")));
+ fileLogAppender->setLayout(std::auto_ptr<log4cplus::Layout>(new log4cplus::PatternLayout("%-5p - %D{%H:%M} (%r ms) - %F:%L : %m%n")));
logger = log4cplus::Logger::getInstance("mainLogger");
logger.addAppender(fileLogAppender);