From fc53b60a1443767c1bf618b1ab1b2b42796dd1ce Mon Sep 17 00:00:00 2001
From: JF Bastien <jfbastien@apple.com>
Date: Fri, 25 May 2018 20:43:57 +0000
Subject: Fix optional deduction guide test breakage

llvm-svn: 333308
---
 .../optional/optional.object/optional.object.ctor/deduct.fail.cpp       | 2 +-
 .../optional/optional.object/optional.object.ctor/deduct.pass.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libcxx/test/std/utilities/optional')

diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
index 4ebafad6b92..5bbb77d46b2 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
@@ -28,7 +28,7 @@ int main()
 //  Test the implicit deduction guides
     {
 //  optional()
-    std::optional opt;   // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'optional'}}
+    std::optional opt;   // expected-error {{declaration of variable 'opt' with deduced type 'std::optional' requires an initializer}}
     }
 
     {
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
index 012cfa46619..3a6b3dcbb0b 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
@@ -45,7 +45,7 @@ int main()
 //  optional(const optional &);
     std::optional<char> source('A');
     std::optional opt(source);
-    static_assert(std::is_same_v<decltype(opt), std::optional<char>>, "");
+    static_assert(std::is_same_v<decltype(opt), std::optional<std::optional<char>>>, "");
     assert(static_cast<bool>(opt) == static_cast<bool>(source));
     assert(*opt == *source);
     }
-- 
cgit v1.2.3