merged 1.4 r982:983 into trunk

This commit is contained in:
Nick Bolton 2011-05-09 00:28:45 +00:00
parent 627771cf13
commit 13c6c36107
18 changed files with 208 additions and 86 deletions

View file

@ -16,12 +16,16 @@
*/
#include "CArchConsoleStd.h"
#include "CLog.h"
#include <iostream>
void
CArchConsoleStd::writeConsole(const char* str)
CArchConsoleStd::writeConsole(ELevel level, const char* str)
{
// TODO: we need to use cerr also somehow
std::cout << str << std::endl;
if ((level >= kFATAL) && (level <= kWARNING))
std::cerr << str << std::endl;
else
std::cout << str << std::endl;
std::cout.flush();
}