make clang-format using clang-format-3.6

This commit is contained in:
Tatsuhiro Tsujikawa 2015-12-27 18:39:47 +09:00
parent 4abad2f64c
commit b1132d6b10
1095 changed files with 30423 additions and 33770 deletions

View file

@ -35,9 +35,9 @@
#include "console.h"
#include "NullOutputFile.h"
#ifdef __MINGW32__
# include "WinConsoleFile.h"
#include "WinConsoleFile.h"
#else // !__MINGW32__
# include "BufferedFile.h"
#include "BufferedFile.h"
#endif // !__MINGW32__
namespace aria2 {
@ -51,28 +51,23 @@ Console consoleCerr;
void initConsole(bool suppress)
{
if(suppress) {
if (suppress) {
consoleCout = consoleCerr = std::make_shared<NullOutputFile>();
} else {
}
else {
#ifdef __MINGW32__
consoleCout = std::make_shared<WinConsoleFile>(STD_OUTPUT_HANDLE);
consoleCerr = std::make_shared<WinConsoleFile>(STD_ERROR_HANDLE);
#else // !__MINGW32__
#else // !__MINGW32__
consoleCout = std::make_shared<BufferedFile>(stdout);
consoleCerr = std::make_shared<BufferedFile>(stderr);
#endif // !__MINGW32__
}
}
const Console& cout()
{
return consoleCout;
}
const Console& cout() { return consoleCout; }
const Console& cerr()
{
return consoleCerr;
}
const Console& cerr() { return consoleCerr; }
} // namespace global