mirror of https://github.com/buggins/dlangui.git
Merge pull request #380 from John-Colvin/patch-3
fix taking address of std{out,err} for dmd 2.075.0-b1
This commit is contained in:
commit
10bb4b4537
|
|
@ -4,6 +4,13 @@ os:
|
|||
- linux
|
||||
- osx
|
||||
|
||||
d:
|
||||
- dmd
|
||||
- dmd-beta
|
||||
- ldc
|
||||
- ldc-beta
|
||||
- gdc-6.3.0
|
||||
|
||||
env:
|
||||
- ARCH=x86_64 CONFIG=default
|
||||
- ARCH=x86_64 CONFIG=minimal
|
||||
|
|
@ -23,6 +30,8 @@ matrix:
|
|||
env: ARCH=x86 CONFIG=x11
|
||||
- os: osx
|
||||
env: ARCH=x86_64 CONFIG=x11
|
||||
- os: osx
|
||||
d: gdc-6.3.0
|
||||
|
||||
sudo: true
|
||||
before_script:
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
static __gshared private LogLevel logLevel = LogLevel.Info;
|
||||
static __gshared private std.stdio.File * logFile = null;
|
||||
|
|
@ -106,21 +114,21 @@ class Log {
|
|||
/// Redirects output to stdout
|
||||
static public void setStdoutLogger() {
|
||||
synchronized(mutex) {
|
||||
logFile = &stdout;
|
||||
logFile = std_io_err_helper!stdout;
|
||||
}
|
||||
}
|
||||
|
||||
/// Redirects output to stderr
|
||||
static public void setStderrLogger() {
|
||||
synchronized(mutex) {
|
||||
logFile = &stderr;
|
||||
logFile = std_io_err_helper!stderr;
|
||||
}
|
||||
}
|
||||
|
||||
/// Redirects output to file
|
||||
static public void setFileLogger(File * file) {
|
||||
synchronized(mutex) {
|
||||
if (logFile !is null && logFile != &stdout && logFile != &stderr) {
|
||||
if (logFile !is null && *logFile != stdout && *logFile != stderr) {
|
||||
logFile.close();
|
||||
destroy(logFile);
|
||||
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
|
||||
__gshared bool APP_IS_SHUTTING_DOWN = false;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue