diff options
| author | David Blaikie <dblaikie@gmail.com> | 2017-01-16 20:28:59 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2017-01-16 20:28:59 +0000 |
| commit | 0cd22f9540c0591132ec991c51103cf800cf4e24 (patch) | |
| tree | 52f7b4a41c53631713e1a388c6b3e438f198b4f5 /llvm | |
| parent | 8e8c444d3ddf2c6ca045a2487070e0ac30a63dda (diff) | |
| download | bcm5719-llvm-0cd22f9540c0591132ec991c51103cf800cf4e24.tar.gz bcm5719-llvm-0cd22f9540c0591132ec991c51103cf800cf4e24.zip | |
Attempt to workaround MSVC build issue where I suspect an enum class constant 0 is considered a possible null pointer
I can't reproduce this so far with web compilers, so throwing this at
the bots to see if it sticks.
llvm-svn: 292155
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/ADT/None.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/include/llvm/ADT/None.h b/llvm/include/llvm/ADT/None.h index 628b3ea8db9..c7a99c61994 100644 --- a/llvm/include/llvm/ADT/None.h +++ b/llvm/include/llvm/ADT/None.h @@ -19,7 +19,8 @@ namespace llvm { /// \brief A simple null object to allow implicit construction of Optional<T> /// and similar types without having to spell out the specialization's name. -enum class NoneType { None }; +// (constant value 1 in an attempt to workaround MSVC build issue... ) +enum class NoneType { None = 1 }; const NoneType None = NoneType::None; } |

