X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flog.hpp;h=9b2951899c5e1651e9285555407fa967fe3a3a1a;hb=f406067af6cbeb0a638078fe1d386d092583909c;hp=716c1299a72ff4c58260fc5f8343a0d1c5a7e196;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/log.hpp b/src/log.hpp index 716c1299a..9b2951899 100644 --- a/src/log.hpp +++ b/src/log.hpp @@ -30,22 +30,22 @@ namespace { inline std::ostream& log_debug_f(const char* file, int line) { - Console::output << "[DEBUG] " << file << " l." << line << ": "; + Console::output << "[DEBUG] " << file << ":" << line << " "; return Console::output; } inline std::ostream& log_info_f(const char* file, int line) { - Console::output << "[INFO] " << file << " l." << line << ": "; + Console::output << "[INFO] " << file << ":" << line << " "; return Console::output; } inline std::ostream& log_warning_f(const char* file, int line) { - Console::output << "[WARNING] " << file << " l." << line << ": "; + Console::output << "[WARNING] " << file << ":" << line << " "; return Console::output; } inline std::ostream& log_fatal_f(const char* file, int line) { - Console::output << "[FATAL] " << file << " l." << line << ": "; + Console::output << "[FATAL] " << file << ":" << line << " "; return Console::output; } @@ -60,11 +60,6 @@ inline std::ostream& log_fatal_f(const char* file, int line) { namespace { -inline std::ostream& log_warning_f() { - Console::output << "Warning: "; - return Console::output; -} - inline std::ostream& log_fatal_f() { Console::output << "Fatal: "; return Console::output; @@ -73,11 +68,15 @@ inline std::ostream& log_fatal_f() { } #define log_debug if (0) std::cerr -#define log_info Console::output -#define log_warning log_warning_f() +#define log_info std::cout +#define log_warning std::cerr #define log_fatal log_fatal_f() #endif -#endif +class Vector; +std::ostream& operator<< (std::ostream& str, const Vector& vector); +class Rect; +std::ostream& operator<< (std::ostream& str, const Rect& rect); +#endif