From: Jörg Sonnenberger Date: Wed, 20 Jun 2012 08:30:55 +0000 (+0000) Subject: re PR libstdc++/53678 (namespace pollution on NetBSD) X-Git-Tag: releases/gcc-4.6.4~482 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b1f3ee0981af83906e41b5a586ee339c4e5ad41;p=thirdparty%2Fgcc.git re PR libstdc++/53678 (namespace pollution on NetBSD) 2012-06-20 Jörg Sonnenberger Jonathan Wakely PR libstdc++/53678 * config/os/bsd/netbsd/ctype_base.h: Check for _CTYPE_U. * testsuite/22_locale/ctype_base/53678.cc: New. Co-Authored-By: Jonathan Wakely From-SVN: r188819 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d8fc4bfbcff9..ff20cb1a197a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2012-06-20 Jörg Sonnenberger + Jonathan Wakely + + PR libstdc++/53678 + * config/os/bsd/netbsd/ctype_base.h: Check for _CTYPE_U. + * testsuite/22_locale/ctype_base/53678.cc: New. + 2012-04-12 Jeffrey Yasskin PR libstdc++/52822 diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h index d75cb79aaf6d..cd654d685c59 100644 --- a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h @@ -1,6 +1,6 @@ // Locale support -*- C++ -*- -// Copyright (C) 2000, 2009 Free Software Foundation, Inc. +// Copyright (C) 2000, 2009, 2011, 2012 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 @@ -31,8 +31,6 @@ // anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h // See www.netbsd.org for details of access. -#include - namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -47,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // on the mask type. Because of this, we don't use an enum. typedef unsigned char mask; -#if __NetBSD_Version__ < 599004100 +#ifndef _CTYPE_U static const mask upper = _U; static const mask lower = _L; static const mask alpha = _U | _L; diff --git a/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc b/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc new file mode 100644 index 000000000000..e4a9f071b929 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc @@ -0,0 +1,28 @@ +// Copyright (C) 2012 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 +// . + +// { dg-do compile } + +// 22.2.1 The ctype category + +#include + +// libstdc++/53678 +void test01() +{ + bool NetBSD __attribute__((unused)) = true; +}