diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
| commit | b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a (patch) | |
| tree | 7462cd2988228ae24c40b37a9382d35874bbf099 /lib/Support/Windows/Windows.h | |
| parent | 23d8d191eff180ba312a4d1b4fec8597e5a988d5 (diff) | |
| parent | 4ef61f2ad4ff509ee05c7051d359009511f81226 (diff) | |
| download | llvm-b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a.tar.gz llvm-b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a.tar.bz2 llvm-b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a.tar.xz | |
Merge branch 'master' into embtk-support-masterembtk-support-master
Diffstat (limited to 'lib/Support/Windows/Windows.h')
| -rw-r--r-- | lib/Support/Windows/Windows.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Support/Windows/Windows.h b/lib/Support/Windows/Windows.h index 5c1da0d617..4cdac788a0 100644 --- a/lib/Support/Windows/Windows.h +++ b/lib/Support/Windows/Windows.h @@ -25,6 +25,7 @@ #define WIN32_LEAN_AND_MEAN #include "llvm/Config/config.h" // Get build system configuration settings +#include "llvm/Support/Compiler.h" #include <windows.h> #include <wincrypt.h> #include <shlobj.h> @@ -75,7 +76,7 @@ public: } // True if Handle is valid. - operator bool() const { + LLVM_EXPLICIT operator bool() const { return HandleTraits::IsValid(Handle) ? true : false; } |