[SeparateConstOffsetFromGEP] inbounds zext => sext for better splitting

[oota-llvm.git] / unittests / Support / CommandLineTest.cpp

diff --git a/unittests/Support/CommandLineTest.cpp b/unittests/Support/CommandLineTest.cpp
index e1d1fa59e58d3e30c4ba2dfcfe9586ffe2597913..b2d71ab795ccc1aefdbae51afd4c09c1adb6fb28 100644 (file)
--- a/unittests/Support/CommandLineTest.cpp
+++ b/unittests/Support/CommandLineTest.cpp
@@ -23,7 +23,7 @@ class TempEnvVar {
   TempEnvVar(const char *name, const char *value)
       : name(name) {
     const char *old_value = getenv(name);
-    EXPECT_EQ(NULL, old_value) << old_value;
+    EXPECT_EQ(nullptr, old_value) << old_value;
 #if HAVE_SETENV
     setenv(name, value, true);
 #else
@@ -44,7 +44,7 @@ class TempEnvVar {
 
 template <typename T>
 class StackOption : public cl::opt<T> {
-  using Base = cl::opt<T>;
+  typedef cl::opt<T> Base;
 public:
   // One option...
   template<class M0t>
@@ -147,7 +147,7 @@ TEST(CommandLineTest, UseOptionCategory) {
 }
 
 class StrDupSaver : public cl::StringSaver {
-  const char *SaveString(const char *Str) LLVM_OVERRIDE {
+  const char *SaveString(const char *Str) override {
     return strdup(Str);
   }
 };