From 896efa6a4cdacdb199b62d4b319c3c51ebdca4df Mon Sep 17 00:00:00 2001
From: Daniel Scharrer <daniel@constexpr.org>
Date: Thu, 17 Jan 2013 11:48:07 +0100
Subject: [PATCH] Remove unused member variables in the logger class

---
 cmake/StyleCheck.cmake |  2 +-
 src/util/log.hpp       | 20 +++-----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/cmake/StyleCheck.cmake b/cmake/StyleCheck.cmake
index ba6d922..fe962f1 100644
--- a/cmake/StyleCheck.cmake
+++ b/cmake/StyleCheck.cmake
@@ -48,7 +48,7 @@ function(add_style_check_target TARGET_NAME SOURCES_LIST INCLUDES_LIST)
 	endif()
 	
 	add_custom_target(${TARGET_NAME}
-		COMMAND cmake -E chdir
+		COMMAND "${CMAKE_COMMAND}" -E chdir
 			"${CMAKE_SOURCE_DIR}"
 			"${PYTHON_EXECUTABLE}"
 			"${CMAKE_MODULE_PATH}/cpplint.py"
diff --git a/src/util/log.hpp b/src/util/log.hpp
index 14ecc59..2f06fc2 100644
--- a/src/util/log.hpp
+++ b/src/util/log.hpp
@@ -27,20 +27,16 @@
 #ifdef DEBUG
 #define debug(...) \
 	if(::logger::debug) \
-		::logger(__FILE__, __LINE__, ::logger::Debug) << __VA_ARGS__
-#define log_info \
-	if(!::logger::quiet) \
-		::logger(__FILE__, __LINE__, ::logger::Info)
-#define log_warning ::logger(__FILE__, __LINE__, ::logger::Warning)
-#define log_error   ::logger(__FILE__, __LINE__, ::logger::Error)
+		::logger(::logger::Debug) << __VA_ARGS__
 #else
 #define debug(...)
+#endif
+
 #define log_info \
 	if(!::logger::quiet) \
 		::logger(::logger::Info)
 #define log_warning ::logger(::logger::Warning)
 #define log_error   ::logger(::logger::Error)
-#endif
 
 /*!
  * logger class that allows longging via the stream operator.
@@ -58,11 +54,6 @@ public:
 	
 private:
 	
-#ifdef DEBUG
-	const char * const file;
-	const int line;
-#endif
-	
 	const log_level level;
 	
 	std::ostringstream buffer; //! Buffer for the log message excluding level, file and line.
@@ -75,12 +66,7 @@ public:
 	static bool debug;
 	static bool quiet;
 	
-#ifdef DEBUG
-	logger(const char * _file, int _line, log_level _level)
-		: file(_file), line(_line), level(_level) { }
-#else
 	logger(log_level _level) : level(_level) { }
-#endif
 	
 	template<class T>
 	logger & operator<<(const T & i) {