diff options
| author | Frederich Munch <colsebas@hotmail.com> | 2017-04-24 03:12:16 +0000 |
|---|---|---|
| committer | Frederich Munch <colsebas@hotmail.com> | 2017-04-24 03:12:16 +0000 |
| commit | 799259f32024f1824849a686a40c53feef4a3c83 (patch) | |
| tree | baab72b590c042212b68e251065643518fd36771 /llvm | |
| parent | c152a963509a6768309850a8e9e2b9570b18486d (diff) | |
| download | bcm5719-llvm-799259f32024f1824849a686a40c53feef4a3c83.tar.gz bcm5719-llvm-799259f32024f1824849a686a40c53feef4a3c83.zip | |
Fix warning converting from boolean to pointer introduced in r301153.
This reverts commit r301155, which was incorrect.
llvm-svn: 301156
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Support/DynamicLibrary.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/DynamicLibrary.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Support/DynamicLibrary.cpp b/llvm/lib/Support/DynamicLibrary.cpp index 05e7ca630ec..1541a572630 100644 --- a/llvm/lib/Support/DynamicLibrary.cpp +++ b/llvm/lib/Support/DynamicLibrary.cpp @@ -61,7 +61,7 @@ public: Handles.push_back(Handle); } else { #ifndef LLVM_ON_WIN32 - if (Process != nullptr) { + if (Process) { if (CanClose) DLClose(Process); if (Process == Handle) diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc index c9bd38ab76c..b43ae54cf85 100644 --- a/llvm/lib/Support/Windows/DynamicLibrary.inc +++ b/llvm/lib/Support/Windows/DynamicLibrary.inc @@ -61,7 +61,7 @@ void *DynamicLibrary::HandleSet::DLOpen(const char *File, std::string *Err) { static DynamicLibrary::HandleSet *IsOpenedHandlesInstance(void *Handle) { if (!OpenedHandles.isConstructed()) - return false; + return nullptr; DynamicLibrary::HandleSet &Inst = *OpenedHandles; return Handle == &Inst ? &Inst : nullptr; } |

