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: [patch] libstdc++/56193 re-add basic_ios::operator bool()


On 24/09/14 23:18 +0100, Jonathan Wakely wrote:
This changes operator void*() to operator bool(), and ensures we
export both from the library.

I have a new test for this, but will commit that tomorrow.

Here are the tests.

Tested x86_64-linux, committed to trunk.

commit 209087345926aaeb5510cb5fd31afd30a345b16d
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Sep 24 23:37:31 2014 +0100

    	* testsuite/27_io/basic_ios/conv/bool_neg.cc: New.
    	* testsuite/27_io/basic_ios/conv/bool.cc: New.
    	* testsuite/27_io/basic_ios/conv/voidptr.cc: New.

diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/conv/bool.cc b/libstdc++-v3/testsuite/27_io/basic_ios/conv/bool.cc
new file mode 100644
index 0000000..bb92092
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/conv/bool.cc
@@ -0,0 +1,39 @@
+// Copyright (C) 2014 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++11" }
+
+#include <ios>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+  const std::basic_ios<char> x(nullptr);
+  bool test = static_cast<bool>(x);
+  VERIFY( !test );
+  if (x)
+  {
+    VERIFY( false );
+  }
+}
+
+int
+main()
+{
+  test01();
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/conv/bool_neg.cc b/libstdc++-v3/testsuite/27_io/basic_ios/conv/bool_neg.cc
new file mode 100644
index 0000000..816f851
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/conv/bool_neg.cc
@@ -0,0 +1,26 @@
+// Copyright (C) 2014 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++11" }
+
+#include <ios>
+
+void
+test01(const std::basic_ios<char>& x)
+{
+  bool b = x; // { dg-error "cannot convert" }
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/conv/voidptr.cc b/libstdc++-v3/testsuite/27_io/basic_ios/conv/voidptr.cc
new file mode 100644
index 0000000..6691982
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/conv/voidptr.cc
@@ -0,0 +1,39 @@
+// Copyright (C) 2014 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++98" }
+
+#include <ios>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+  const std::basic_ios<char> x(0);
+  void* p = x;
+  VERIFY( !p );
+  if (x)
+  {
+    VERIFY( false );
+  }
+}
+
+int
+main()
+{
+  test01();
+}

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