Merge pull request #2919 from yebblies/impbool

Remove implicit conversions from array to bool
dlang · Jan 27, 2015 · a5de927 · a5de927
2 parents 98acfe9 + 6af3fb5
commit a5de927
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/std/datetime.d b/std/datetime.d
@@ -26372,13 +26372,15 @@ auto tz = TimeZone.getTimeZone("America/Los_Angeles");
         else version(Windows)
         {
             import std.format : format;
-            if(auto windowsTZName = tzDatabaseNameToWindowsTZName(name))
+            auto windowsTZName = tzDatabaseNameToWindowsTZName(name);
+            if(windowsTZName != null)
             {
                 try
                     return WindowsTimeZone.getTimeZone(windowsTZName);
                 catch(DateTimeException dte)
                 {
-                    if(auto oldName = _getOldName(windowsTZName))
+                    auto oldName = _getOldName(windowsTZName);
+                    if(oldName != null)
                         return WindowsTimeZone.getTimeZone(oldName);
                     throw dte;
                 }

diff --git a/std/mmfile.d b/std/mmfile.d
@@ -221,7 +221,7 @@ class MmFile
                 assert(0);
             }
 
-            if (filename)
+            if (filename != null)
             {
                 hFile = CreateFileW(filename.tempCStringW(),
                         dwDesiredAccess2,
@@ -242,7 +242,7 @@ class MmFile
             wenforce(hFileMap, "CreateFileMapping");
             scope(failure) CloseHandle(hFileMap);
 
-            if (size == 0 && filename)
+            if (size == 0 && filename != null)
             {
                 uint sizehi;
                 uint sizelow = GetFileSize(hFile, &sizehi);

diff --git a/std/windows/syserror.d b/std/windows/syserror.d
@@ -127,7 +127,7 @@ class WindowsException : Exception
 
         auto buf = appender!string();
 
-        if (str)
+        if (str != null)
         {
             buf.put(str);
             buf.put(": ");