1 files changed, 36 insertions, 25 deletions
diff --git a/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp b/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
index ae2ff808fb25..a4ffdc25e721 100644
--- a/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
+++ b/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
@@ -17,37 +17,48 @@
 
 using std::optional;
 
-struct X
-{
-    int i_;
+struct X {
+  int i_;
 
-    constexpr X(int i) : i_(i) {}
+  constexpr X(int i) : i_(i) {}
 };
 
-constexpr bool operator != ( const X &lhs, const X &rhs )
-    { return lhs.i_ != rhs.i_ ; }
+constexpr bool operator!=(const X& lhs, const X& rhs) {
+  return lhs.i_ != rhs.i_;
+}
 
-int main()
-{
-    {
+int main() {
+  {
     typedef X T;
     typedef optional<T> O;
 
     constexpr T val(2);
-    constexpr O o1;       // disengaged
-    constexpr O o2{1};    // engaged
-    constexpr O o3{val};  // engaged
-
-    static_assert (  (o1 != T(1)), "" );
-    static_assert ( !(o2 != T(1)), "" );
-    static_assert (  (o3 != T(1)), "" );
-    static_assert ( !(o3 != T(2)), "" );
-    static_assert ( !(o3 != val),  "" );
-
-    static_assert (  (T(1) != o1), "" );
-    static_assert ( !(T(1) != o2), "" );
-    static_assert (  (T(1) != o3), "" );
-    static_assert ( !(T(2) != o3), "" );
-    static_assert ( !(val  != o3), "" );
-    }
+    constexpr O o1;      // disengaged
+    constexpr O o2{1};   // engaged
+    constexpr O o3{val}; // engaged
+
+    static_assert((o1 != T(1)), "");
+    static_assert(!(o2 != T(1)), "");
+    static_assert((o3 != T(1)), "");
+    static_assert(!(o3 != T(2)), "");
+    static_assert(!(o3 != val), "");
+
+    static_assert((T(1) != o1), "");
+    static_assert(!(T(1) != o2), "");
+    static_assert((T(1) != o3), "");
+    static_assert(!(T(2) != o3), "");
+    static_assert(!(val != o3), "");
+  }
+  {
+    using O = optional<int>;
+    constexpr O o1(42);
+    static_assert(o1 != 101l, "");
+    static_assert(!(42l != o1), "");
+  }
+  {
+    using O = optional<const int>;
+    constexpr O o1(42);
+    static_assert(o1 != 101, "");
+    static_assert(!(42 != o1), "");
+  }
 }