mirror of https://github.com/buggins/dlangui.git
fix taking address of std{out,err} for dmd 2.075.0-b1
This commit is contained in:
parent
cca2b28ce9
commit
80daed61a0
|
@ -92,6 +92,14 @@ Log.e("exception while reading file", e);
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
private auto std_io_err_helper(alias v)()
|
||||||
|
{
|
||||||
|
static if (__VERSION__ < 2075)
|
||||||
|
return &v;
|
||||||
|
else
|
||||||
|
return &v();
|
||||||
|
}
|
||||||
|
|
||||||
class Log {
|
class Log {
|
||||||
static __gshared private LogLevel logLevel = LogLevel.Info;
|
static __gshared private LogLevel logLevel = LogLevel.Info;
|
||||||
static __gshared private std.stdio.File * logFile = null;
|
static __gshared private std.stdio.File * logFile = null;
|
||||||
|
@ -106,21 +114,21 @@ class Log {
|
||||||
/// Redirects output to stdout
|
/// Redirects output to stdout
|
||||||
static public void setStdoutLogger() {
|
static public void setStdoutLogger() {
|
||||||
synchronized(mutex) {
|
synchronized(mutex) {
|
||||||
logFile = &stdout;
|
logFile = std_io_err_helper!stdout;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Redirects output to stderr
|
/// Redirects output to stderr
|
||||||
static public void setStderrLogger() {
|
static public void setStderrLogger() {
|
||||||
synchronized(mutex) {
|
synchronized(mutex) {
|
||||||
logFile = &stderr;
|
logFile = std_io_err_helper!stderr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Redirects output to file
|
/// Redirects output to file
|
||||||
static public void setFileLogger(File * file) {
|
static public void setFileLogger(File * file) {
|
||||||
synchronized(mutex) {
|
synchronized(mutex) {
|
||||||
if (logFile !is null && logFile != &stdout && logFile != &stderr) {
|
if (logFile !is null && *logFile != stdout && *logFile != stderr) {
|
||||||
logFile.close();
|
logFile.close();
|
||||||
destroy(logFile);
|
destroy(logFile);
|
||||||
logFile = null;
|
logFile = null;
|
||||||
|
@ -348,4 +356,3 @@ void onResourceDestroyWhileShutdown(string resourceName, string objname = null)
|
||||||
|
|
||||||
/// set to true when exiting main - to detect destructor calls for resources by GC
|
/// set to true when exiting main - to detect destructor calls for resources by GC
|
||||||
__gshared bool APP_IS_SHUTTING_DOWN = false;
|
__gshared bool APP_IS_SHUTTING_DOWN = false;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue