Rename Optional::None to Invalid.

This fixes a name conflict with the XWindow headers on Linux. Only becomes an issue when using Optional inside GL-level libANGLE. BUG=angleproject:1123 Change-Id: I7f0eb278a8b6eb6fecd864e556428678cb90dcea Reviewed-on: https://chromium-review.googlesource.com/298892Reviewed-by: Corentin Wallez <cwallez@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Rename Optional::None to Invalid.
c38ae7df · Jamie Madill · 1170e474 · c38ae7df · c38ae7df
Commit c38ae7df authored Sep 14, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

Optional.h src/common/Optional.h +1 -4

Optional_unittest.cpp src/common/Optional_unittest.cpp +2 -2

No files found.
--- a/src/common/Optional.h
+++ b/src/common/Optional.h
@@ -47,10 +47,7 @@ struct Optional
        mValid = false;
    }

-    static Optional None()
-    {
-        return Optional();
-    }
+    static Optional Invalid() { return Optional(); }

    bool valid() const { return mValid; }
    const T &value() const { return mValue; }

--- a/src/common/Optional_unittest.cpp
+++ b/src/common/Optional_unittest.cpp
@@ -18,7 +18,7 @@ TEST(OptionalTest, BasicInvalid)
 {
    Optional<int> testInvalid;
    ASSERT_FALSE(testInvalid.valid());
-    ASSERT_EQ(Optional<int>::None(), testInvalid);
+    ASSERT_EQ(Optional<int>::Invalid(), testInvalid);
 }

 TEST(OptionalTest, BasicValid)
@@ -26,7 +26,7 @@ TEST(OptionalTest, BasicValid)
    Optional<int> testValid(3);
    ASSERT_TRUE(testValid.valid());
    ASSERT_EQ(3, testValid.value());
-    ASSERT_NE(Optional<int>::None(), testValid);
+    ASSERT_NE(Optional<int>::Invalid(), testValid);
 }

 TEST(OptionalTest, Copies)