This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [v3 PATCH] PR libstdc++/77288 and the newest proposed resolution for LWG 2756


On 22 September 2016 at 12:37, Christophe Lyon
<christophe.lyon@linaro.org> wrote:
>> Does the attached patch fix the problem?
>
> Yes, thanks!

Here be the changelog. Jonathan, ok for trunk? Patch attached again
for convenience.

2016-09-22  Ville Voutilainen  <ville.voutilainen@gmail.com>

    Fix tests on old arm platforms for optional.
    * testsuite/20_util/optional/77288.cc: Don't use exception_ptr.
diff --git a/libstdc++-v3/testsuite/20_util/optional/77288.cc b/libstdc++-v3/testsuite/20_util/optional/77288.cc
index eafafb7..0df74a9 100644
--- a/libstdc++-v3/testsuite/20_util/optional/77288.cc
+++ b/libstdc++-v3/testsuite/20_util/optional/77288.cc
@@ -18,7 +18,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-#include <exception>
 #include <optional>
 #include <any>
 
@@ -28,8 +27,8 @@ using std::optional;
 
 void test01()
 {
-    optional<optional<std::exception_ptr>> nested_element;
-    optional<std::exception_ptr> element = {};
+    optional<optional<int>> nested_element;
+    optional<int> element = {};
     nested_element = element;
     VERIFY(nested_element);
 }

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]