Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Debug.h so that it can be used in more than one class at a time. Also added include guard. 

Fixes most of #1922
This commit is contained in:
mark 2006-11-30 13:31:58 +00:00
parent 3fd1e71d51
commit 2eb30be97a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
campcaster/src/modules/core/include/LiveSupport/Core/Debug.h
View File

@ -28,6 +28,9 @@
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#ifndef CAMPCASTER_DEBUG_H
#define CAMPCASTER_DEBUG_H
#include "configure.h" #include "configure.h"
#include <iostream> #include <iostream>
@ -48,7 +51,7 @@
namespace LiveSupport { namespace LiveSupport {
namespace Core { namespace Core {
namespace Debug { namespace Debug {
int indentAmount = 0; static int indentAmount = 0;
} }
} }
} }
@ -132,14 +135,14 @@ using namespace LiveSupport::Core;
NoDebugStream& operator<<(std::string) { return *this; } NoDebugStream& operator<<(std::string) { return *this; }
}; };
NoDebugStream debug() { return NoDebugStream(); } static inline NoDebugStream debug() { return NoDebugStream(); }
NoDebugStream warning() { return NoDebugStream(); } static inline NoDebugStream warning() { return NoDebugStream(); }
NoDebugStream error() { return NoDebugStream(); } static inline NoDebugStream error() { return NoDebugStream(); }
inline NoDebugStream &endl( NoDebugStream & s) { return s; } inline NoDebugStream &endl( NoDebugStream & s) { return s; }
#else #else
std::ostream& debug() { return std::cout << std::string(Debug::indentAmount, ' ') << CMP_PREFIX; } static inline std::ostream& debug() { return std::cout << std::string(Debug::indentAmount, ' ') << CMP_PREFIX; }
std::ostream& warning() { return std::cout << std::string(Debug::indentAmount, ' ') << CMP_PREFIX << "[WARNING!] "; } static inline std::ostream& warning() { return std::cout << std::string(Debug::indentAmount, ' ') << CMP_PREFIX << "[WARNING!] "; }
std::ostream& error() { return std::cout << std::string(Debug::indentAmount, ' ') << CMP_PREFIX << "[ERROR!] "; } static inline std::ostream& error() { return std::cout << std::string(Debug::indentAmount, ' ') << CMP_PREFIX << "[ERROR!] "; }
#endif #endif
using std::endl; using std::endl;
@ -246,3 +249,6 @@ namespace Debug
/// Announce a line /// Announce a line
#define DEBUG_LINE_INFO { debug() << '[' << __PRETTY_FUNCTION__ << ']' << "Line: " << __LINE__ << endl; } #define DEBUG_LINE_INFO { debug() << '[' << __PRETTY_FUNCTION__ << ']' << "Line: " << __LINE__ << endl; }
#endif //CAMPCASTER_DEBUG_H