From 347669a079a7005bf211e57cba5db24d0b99f2f3 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 24 Mar 2005 05:45:45 +0000 Subject: acinclude.m4: Adjust so that _GLIBCXX_USE_C99 implies using _GLIBCXX_USE_C99_COMPLEX... 2005-03-23 Benjamin Kosnik * acinclude.m4: Adjust so that _GLIBCXX_USE_C99 implies using _GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_USE_C99_MATH, and _GLIBCXX_USE_C99_WCHAR. Remove GLIBCXX_ENABLE_C_MBCHAR, consolidate in GLIBCXX_ENABLE_C99 and GLIBCXX_ENABLE_WCHAR_T. Take C99 bits from GLIBCXX_CHECK_WCHAR_T_SUPPORT and put in GLIBCXX_ENABLE_C99. Change remaining parts of GLIBCXX_CHECK_WCHAR_T_SUPPORT to GLIBCXX_CHECK_ICONV_SUPPORT. * configure.ac: Remove GLIBCXX_ENABLE_C_MBCHAR, use GLIBCXX_CHECK_ICONV_SUPPORT and GLIBCXX_ENABLE_WCHAR_T. * crossconfig.m4: Same. * acconfig.h: Same, adjust comments. * config.h.in: Regenerate. * configure: Regenerate. * docs/html/configopts.html: Change --enable-c-mbchar to --enable-wchar_t. * config/locale/gnu/c++locale_internal.h: Guard wide functions with _GLIBCXX_USE_WCHAR_T. * include/c_std/std_cwctype.h: Alphabetize, remove duplicates. * include/c_std/std_cstdio.h: Spacing. * config/locale/gnu/c_locale.h: Tweaks for unused warnings. * src/debug.cc: Same. From-SVN: r96981 --- libstdc++-v3/src/debug.cc | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'libstdc++-v3/src') diff --git a/libstdc++-v3/src/debug.cc b/libstdc++-v3/src/debug.cc index 415fcbf..3375adf 100644 --- a/libstdc++-v3/src/debug.cc +++ b/libstdc++-v3/src/debug.cc @@ -1,6 +1,6 @@ // Debugging mode support code -*- C++ -*- -// Copyright (C) 2003, 2004 +// Copyright (C) 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -507,7 +507,7 @@ namespace __gnu_debug template void _Error_formatter::_M_format_word(char* __buf, - int __n __attribute__((__unused__)), + int __n __attribute__ ((__unused__)), const char* __fmt, _Tp __s) const { #ifdef _GLIBCXX_USE_C99 @@ -653,21 +653,20 @@ namespace __gnu_debug // Instantiations. template void - _Error_formatter::_M_format_word(char* __buf, int __n, const char* __fmt, - const void* __s) const; + _Error_formatter::_M_format_word(char*, int, const char*, + const void*) const; template void - _Error_formatter::_M_format_word(char* __buf, int __n, const char* __fmt, - long __s) const; + _Error_formatter::_M_format_word(char*, int, const char*, long) const; template void - _Error_formatter::_M_format_word(char* __buf, int __n, const char* __fmt, - std::size_t __s) const; + _Error_formatter::_M_format_word(char*, int, const char*, + std::size_t) const; template void - _Error_formatter::_M_format_word(char* __buf, int __n, const char* __fmt, - const char* __s) const; + _Error_formatter::_M_format_word(char*, int, const char*, + const char*) const; } // namespace __gnu_debug -- cgit v1.1