Merge
This commit is contained in:
commit
40d84ade8a
@ -29,11 +29,17 @@
|
|||||||
#include "memory/allocation.inline.hpp"
|
#include "memory/allocation.inline.hpp"
|
||||||
|
|
||||||
static bool initialized;
|
static bool initialized;
|
||||||
static char stdoutmem[sizeof(LogStdoutOutput)];
|
static union {
|
||||||
static char stderrmem[sizeof(LogStderrOutput)];
|
char stdoutmem[sizeof(LogStdoutOutput)];
|
||||||
|
jlong dummy;
|
||||||
|
} aligned_stdoutmem;
|
||||||
|
static union {
|
||||||
|
char stderrmem[sizeof(LogStderrOutput)];
|
||||||
|
jlong dummy;
|
||||||
|
} aligned_stderrmem;
|
||||||
|
|
||||||
LogStdoutOutput &StdoutLog = reinterpret_cast<LogStdoutOutput&>(stdoutmem);
|
LogStdoutOutput &StdoutLog = reinterpret_cast<LogStdoutOutput&>(aligned_stdoutmem.stdoutmem);
|
||||||
LogStderrOutput &StderrLog = reinterpret_cast<LogStderrOutput&>(stderrmem);
|
LogStderrOutput &StderrLog = reinterpret_cast<LogStderrOutput&>(aligned_stderrmem.stderrmem);
|
||||||
|
|
||||||
LogFileStreamInitializer::LogFileStreamInitializer() {
|
LogFileStreamInitializer::LogFileStreamInitializer() {
|
||||||
if (!initialized) {
|
if (!initialized) {
|
||||||
|
Loading…
Reference in New Issue
Block a user