Use ELFOSABI_NONE instead of ELFOSABI_LINUX.

[oota-llvm.git] / include / llvm / ADT / None.h

diff --git a/include/llvm/ADT/None.h b/include/llvm/ADT/None.h
index 83c952178a580c0ccf734e32f7a2471f7db6ab22..d69ec17c15f910ce0ea6a6a3ead2d02d93f8eefe 100644 (file)
--- a/include/llvm/ADT/None.h
+++ b/include/llvm/ADT/None.h
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This file provides None, an enumerant for use in implicit constructors
+//  This file provides None, an enumerator for use in implicit constructors
 //  of various (usually templated) types to make such construction more
 //  terse.
 //
@@ -19,9 +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 NoneType {
-  None
-};
+enum class NoneType { None };
+const NoneType None = None;
 }
 
 #endif