mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-11 20:55:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

testsuite_iterators.h: Don't include <cstddef>, don't use NULL, use std::size_t and std::ptrdiff_t.

Browse Source 
2010-06-03  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/util/testsuite_iterators.h: Don't include <cstddef>,
	don't use NULL, use std::size_t and std::ptrdiff_t.
	* testsuite/18_support/exception/38732.cc: Likewise.
	* testsuite/22_locale/time_put/put/wchar_t/12439_1.cc: Likewise.
	* testsuite/22_locale/time_put/put/wchar_t/12439_2.cc: Likewise.
	* testsuite/22_locale/time_put/put/wchar_t/12439_3.cc: Likewise.
	* testsuite/22_locale/locale/cons/12658_thread-2.cc: Likewise.
	* testsuite/22_locale/locale/cons/12658_thread-2.cc: Likewise.
	* testsuite/23_containers/list/pthread1.cc: Likewise.
	* testsuite/23_containers/map/pthread6.cc: Likewise.
	* testsuite/util/testsuite_hooks.cc: Likewise.
	* config/locale/gnu/codecvt_members.cc: Likewise.
	* config/locale/gnu/messages_members.cc: Likewise.
	* config/locale/gnu/c_locale.h: Likewise.
	* config/locale/gnu/messages_members.h: Likewise.
	* config/locale/gnu/monetary_members.cc: Likewise.
	* config/locale/gnu/time_members.cc: Likewise.
	* config/locale/gnu/time_members.h: Likewise.
	* config/locale/generic/c_locale.cc: Likewise.
	* config/locale/generic/codecvt_members.cc: Likewise.
	* config/locale/generic/c_locale.h: Likewise.
	* config/locale/generic/time_members.cc: Likewise.
	* config/locale/generic/time_members.h: Likewise.

From-SVN: r160238
This commit is contained in:
Paolo Carlini 2010-06-03 23:11:46 +00:00 committed by Paolo Carlini
parent bb6c4ac85a
commit 445877a9da
22 changed files with 94 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,29 @@
2010-06-03 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/util/testsuite_iterators.h: Don't include <cstddef>,
don't use NULL, use std::size_t and std::ptrdiff_t.
* testsuite/18_support/exception/38732.cc: Likewise.
* testsuite/22_locale/time_put/put/wchar_t/12439_1.cc: Likewise.
* testsuite/22_locale/time_put/put/wchar_t/12439_2.cc: Likewise.
* testsuite/22_locale/time_put/put/wchar_t/12439_3.cc: Likewise.
* testsuite/22_locale/locale/cons/12658_thread-2.cc: Likewise.
* testsuite/22_locale/locale/cons/12658_thread-2.cc: Likewise.
* testsuite/23_containers/list/pthread1.cc: Likewise.
* testsuite/23_containers/map/pthread6.cc: Likewise.
* testsuite/util/testsuite_hooks.cc: Likewise.
* config/locale/gnu/codecvt_members.cc: Likewise.
* config/locale/gnu/messages_members.cc: Likewise.
* config/locale/gnu/c_locale.h: Likewise.
* config/locale/gnu/messages_members.h: Likewise.
* config/locale/gnu/monetary_members.cc: Likewise.
* config/locale/gnu/time_members.cc: Likewise.
* config/locale/gnu/time_members.h: Likewise.
* config/locale/generic/c_locale.cc: Likewise.
* config/locale/generic/codecvt_members.cc: Likewise.
* config/locale/generic/c_locale.h: Likewise.
* config/locale/generic/time_members.cc: Likewise.
* config/locale/generic/time_members.h: Likewise.
2010-06-03 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/c++config (std::size_t, std::ptrdiff_t,

11
libstdc++-v3/config/locale/generic/c_locale.cc
View File

@ -36,7 +36,6 @@
#include <cstdio>
#include <locale>
#include <limits>
#include <cstddef>
#ifdef _GLIBCXX_HAVE_IEEEFP_H
#include <ieeefp.h>
@ -50,7 +49,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
const __c_locale&) throw()
{
// Assumes __s formatted for "C" locale.
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __len = strlen(__old) + 1;
char* __sav = new char[__len];
memcpy(__sav, __old, __len);
@ -115,7 +114,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
const __c_locale&) throw()
{
// Assumes __s formatted for "C" locale.
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __len = strlen(__old) + 1;
char* __sav = new char[__len];
memcpy(__sav, __old, __len);
@ -160,7 +159,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
ios_base::iostate& __err, const __c_locale&) throw()
{
// Assumes __s formatted for "C" locale.
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __len = strlen(__old) + 1;
char* __sav = new char[__len];
memcpy(__sav, __old, __len);
@ -212,7 +211,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{
// Currently, the generic model only supports the "C" locale.
// See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html
__cloc = NULL;
__cloc = 0;
if (strcmp(__s, "C"))
__throw_runtime_error(__N("locale::facet::_S_create_c_locale "
"name not valid"));
@ -220,7 +219,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
void
locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
{ __cloc = NULL; }
{ __cloc = 0; }
__c_locale
locale::facet::_S_clone_c_locale(__c_locale&) throw()

7
libstdc++-v3/config/locale/generic/c_locale.h
View File

@ -1,6 +1,6 @@
// Wrapper for underlying C-language localization -*- C++ -*-
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -40,7 +40,6 @@
#pragma GCC system_header
#include <clocale>
#include <cstddef>
#define _GLIBCXX_NUM_CATEGORIES 0
@ -57,8 +56,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
const int __size __attribute__((__unused__)),
const char* __fmt, ...)
{
char* __old = std::setlocale(LC_NUMERIC, NULL);
char* __sav = NULL;
char* __old = std::setlocale(LC_NUMERIC, 0);
char* __sav = 0;
if (__builtin_strcmp(__old, "C"))
{
const size_t __len = __builtin_strlen(__old) + 1;

4
libstdc++-v3/config/locale/generic/codecvt_members.cc
View File

@ -1,6 +1,6 @@
// std::codecvt implementation details, generic version -*- C++ -*-
// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009
// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -186,7 +186,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
while (__from < __end && __max)
{
size_t __conv = mbrtowc(NULL, __from, __end - __from, &__tmp_state);
size_t __conv = mbrtowc(0, __from, __end - __from, &__tmp_state);
if (__conv == static_cast<size_t>(-1))
{
// Invalid source character

4
libstdc++-v3/config/locale/generic/time_members.cc
View File

@ -42,7 +42,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_M_put(char* __s, size_t __maxlen, const char* __format,
const tm* __tm) const throw()
{
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __llen = strlen(__old) + 1;
char* __sav = new char[__llen];
memcpy(__sav, __old, __llen);
@ -127,7 +127,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
const tm* __tm) const throw()
{
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __llen = strlen(__old) + 1;
char* __sav = new char[__llen];
memcpy(__sav, __old, __llen);

7
libstdc++-v3/config/locale/generic/time_members.h
View File

@ -1,6 +1,7 @@
// std::time_get, std::time_put implementation, generic version -*- C++ -*-
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
// 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -39,7 +40,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
template<typename _CharT>
__timepunct<_CharT>::__timepunct(size_t __refs)
: facet(__refs), _M_data(NULL)
: facet(__refs), _M_data(0)
{
_M_name_timepunct = _S_get_c_name();
_M_initialize_timepunct();
@ -56,7 +57,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
template<typename _CharT>
__timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
size_t __refs)
: facet(__refs), _M_data(NULL)
: facet(__refs), _M_data(0)
{
if (__builtin_strcmp(__s, _S_get_c_name()) != 0)
{

7
libstdc++-v3/config/locale/gnu/c_locale.h
View File

@ -1,6 +1,6 @@
// Wrapper for underlying C-language localization -*- C++ -*-
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -40,7 +40,6 @@
#pragma GCC system_header
#include <clocale>
#include <cstddef>
#define _GLIBCXX_C_LOCALE_GNU 1
@ -71,8 +70,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__c_locale __old = __gnu_cxx::__uselocale(__cloc);
#else
char* __old = std::setlocale(LC_NUMERIC, NULL);
char* __sav = NULL;
char* __old = std::setlocale(LC_NUMERIC, 0);
char* __sav = 0;
if (__builtin_strcmp(__old, "C"))
{
const size_t __len = __builtin_strlen(__old) + 1;

4
libstdc++-v3/config/locale/gnu/codecvt_members.cc
View File

@ -1,6 +1,6 @@
// std::codecvt implementation details, GNU version -*- C++ -*-
// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009
// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -268,7 +268,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// mbrtowc.
for (__from = __tmp_from;; __from += __conv)
{
__conv = mbrtowc(NULL, __from, __end - __from,
__conv = mbrtowc(0, __from, __end - __from,
&__tmp_state);
if (__conv == static_cast<size_t>(-1)
|| __conv == static_cast<size_t>(-2))

6
libstdc++-v3/config/locale/gnu/messages_members.cc
View File

@ -1,6 +1,6 @@
// std::messages implementation details, GNU version -*- C++ -*-
// Copyright (C) 2001, 2002, 2005, 2009 Free Software Foundation, Inc.
// Copyright (C) 2001, 2002, 2005, 2009, 2010 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
@ -44,7 +44,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__uselocale(__old);
return string(__msg);
#else
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __len = strlen(__old) + 1;
char* __sav = new char[__len];
memcpy(__sav, __old, __len);
@ -67,7 +67,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__uselocale(__old);
return _M_convert_from_char(__msg);
# else
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __len = strlen(__old) + 1;
char* __sav = new char[__len];
memcpy(__sav, __old, __len);

4
libstdc++-v3/config/locale/gnu/messages_members.h
View File

@ -1,6 +1,6 @@
// std::messages implementation details, GNU version -*- C++ -*-
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -48,7 +48,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
template<typename _CharT>
messages<_CharT>::messages(__c_locale __cloc, const char* __s,
size_t __refs)
: facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
: facet(__refs), _M_c_locale_messages(0), _M_name_messages(0)
{
if (__builtin_strcmp(__s, _S_get_c_name()) != 0)
{

4
libstdc++-v3/config/locale/gnu/monetary_members.cc
View File

@ -574,7 +574,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__c_locale __old = __uselocale(__cloc);
#else
// Switch to named locale so that mbsrtowcs will work.
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __llen = strlen(__old) + 1;
char* __sav = new char[__llen];
memcpy(__sav, __old, __llen);
@ -757,7 +757,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__c_locale __old = __uselocale(__cloc);
#else
// Switch to named locale so that mbsrtowcs will work.
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __llen = strlen(__old) + 1;
char* __sav = new char[__llen];
memcpy(__sav, __old, __llen);

4
libstdc++-v3/config/locale/gnu/time_members.cc
View File

@ -45,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
_M_c_locale_timepunct);
#else
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __llen = strlen(__old) + 1;
char* __sav = new char[__llen];
memcpy(__sav, __old, __llen);
@ -201,7 +201,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
_M_c_locale_timepunct);
#else
char* __old = setlocale(LC_ALL, NULL);
char* __old = setlocale(LC_ALL, 0);
const size_t __llen = strlen(__old) + 1;
char* __sav = new char[__llen];
memcpy(__sav, __old, __llen);

11
libstdc++-v3/config/locale/gnu/time_members.h
View File

@ -1,6 +1,7 @@
// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
// 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -39,21 +40,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
template<typename _CharT>
__timepunct<_CharT>::__timepunct(size_t __refs)
: facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
: facet(__refs), _M_data(0), _M_c_locale_timepunct(0),
_M_name_timepunct(_S_get_c_name())
{ _M_initialize_timepunct(); }
template<typename _CharT>
__timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
: facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
: facet(__refs), _M_data(__cache), _M_c_locale_timepunct(0),
_M_name_timepunct(_S_get_c_name())
{ _M_initialize_timepunct(); }
template<typename _CharT>
__timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
size_t __refs)
: facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
_M_name_timepunct(NULL)
: facet(__refs), _M_data(0), _M_c_locale_timepunct(0),
_M_name_timepunct(0)
{
if (__builtin_strcmp(__s, _S_get_c_name()) != 0)
{

9
libstdc++-v3/testsuite/18_support/exception/38732.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2009 Free Software Foundation, Inc.
// Copyright (C) 2009, 2010 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
@ -17,7 +17,6 @@
#include <typeinfo>
#include <exception>
#include <cstddef>
#include "unwind.h"
#include <testsuite_hooks.h>
@ -67,21 +66,21 @@ void test01 ()
throw 0;
} catch(...) {
__cxa_exception *exc = __cxa_get_globals()->caughtExceptions;
VERIFY ( exc != NULL );
VERIFY ( exc != 0 );
VERIFY ( typeid(int) == *exc->exceptionType );
}
try {
throw 0LL;
} catch(...) {
__cxa_exception *exc = __cxa_get_globals()->caughtExceptions;
VERIFY ( exc != NULL );
VERIFY ( exc != 0 );
VERIFY ( typeid(long long int) == *exc->exceptionType );
}
try {
throw 0.0;
} catch(...) {
__cxa_exception *exc = __cxa_get_globals()->caughtExceptions;
VERIFY ( exc != NULL );
VERIFY ( exc != 0 );
VERIFY ( typeid(double) == *exc->exceptionType );
}
}

6
libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc
View File

@ -3,7 +3,7 @@
// { dg-options "-pthreads" { target *-*-solaris* } }
// { dg-require-namedlocale "" }
// Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation
// Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation
//
// 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
@ -55,10 +55,10 @@ main()
loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR");
for (int i = 0; i < max_thread_count; i++)
pthread_create(&tid[i], NULL, thread_main, 0);
pthread_create(&tid[i], 0, thread_main, 0);
for (int i = 0; i < max_thread_count; i++)
pthread_join(tid[i], NULL);
pthread_join(tid[i], 0);
return 0;
}

4
libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_1.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2003, 2009 Free Software Foundation
// Copyright (C) 2003, 2009, 2010 Free Software Foundation
//
// 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
@ -45,7 +45,7 @@ void test01()
bool test __attribute__((unused)) = true;
wostringstream stream;
time_t tt = time(NULL);
time_t tt = time(0);
const wchar_t* fmt = L"%c";

4
libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_2.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2003, 2009 Free Software Foundation
// Copyright (C) 2003, 2009, 2010 Free Software Foundation
//
// 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
@ -42,7 +42,7 @@ void test02()
locale loc;
const tp_type& tp = use_facet<tp_type>(loc);
time_t tt = time(NULL);
time_t tt = time(0);
wostringstream stream;
tp.put(tp_type::iter_type(stream), stream, stream.fill(),

4
libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_3.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2003, 2009 Free Software Foundation
// Copyright (C) 2003, 2009, 2010 Free Software Foundation
//
// 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
@ -44,7 +44,7 @@ void test03()
bool test __attribute__((unused)) = true;
wostringstream stream;
time_t tt = time(NULL);
time_t tt = time(0);
const wchar_t* fmt = L"%c";

15
libstdc++-v3/testsuite/23_containers/list/pthread1.cc
View File

@ -31,7 +31,6 @@
#include <list>
#include <cstdlib>
#include <cstddef>
#include <pthread.h>
const int thread_cycles = 10;
@ -46,9 +45,9 @@ class task_queue
public:
task_queue ()
{
pthread_mutex_init (&fooLock, NULL);
pthread_cond_init (&fooCond1, NULL);
pthread_cond_init (&fooCond2, NULL);
pthread_mutex_init (&fooLock, 0);
pthread_cond_init (&fooCond1, 0);
pthread_cond_init (&fooCond2, 0);
}
~task_queue ()
{
@ -116,14 +115,14 @@ main()
for (int i = 0; i < thread_pairs; i++)
{
tq[i] = new task_queue;
pthread_create (&prod[i], NULL, produce, static_cast<void*> (tq[i]));
pthread_create (&cons[i], NULL, consume, static_cast<void*> (tq[i]));
pthread_create (&prod[i], 0, produce, static_cast<void*> (tq[i]));
pthread_create (&cons[i], 0, consume, static_cast<void*> (tq[i]));
}
for (int i = 0; i < thread_pairs; i++)
{
pthread_join (prod[i], NULL);
pthread_join (cons[i], NULL);
pthread_join (prod[i], 0);
pthread_join (cons[i], 0);
delete tq[i];
}
}

5
libstdc++-v3/testsuite/23_containers/map/pthread6.cc
View File

@ -26,7 +26,6 @@
#include <string>
#include <map>
#include <vector>
#include <cstddef>
#include <pthread.h>
const int max_thread_count = 8;
@ -79,10 +78,10 @@ main (void)
#endif
for (int i = 0; i < max_thread_count; i++)
pthread_create (&tid[i], NULL, thread_main, 0);
pthread_create (&tid[i], 0, thread_main, 0);
for (int i = 0; i < max_thread_count; i++)
pthread_join (tid[i], NULL);
pthread_join (tid[i], 0);
return 0;
}

3
libstdc++-v3/testsuite/util/testsuite_hooks.cc
View File

@ -32,7 +32,6 @@
#include <list>
#include <string>
#include <stdexcept>
#include <cstddef>
#include <clocale>
#include <cstdlib>
#include <locale>
@ -176,7 +175,7 @@ namespace __gnu_test
const func_callback::test_type* tests = l.tests();
for (int i = 0; i < l.size(); ++i)
(*tests[i])();
string postLC_ALL= setlocale(LC_ALL, NULL);
string postLC_ALL= setlocale(LC_ALL, 0);
VERIFY( preLC_ALL == postLC_ALL );
}
else

18
libstdc++-v3/testsuite/util/testsuite_iterators.h
View File

@ -118,7 +118,7 @@ namespace __gnu_test
*/
template<class T>
struct output_iterator_wrapper
: public std::iterator<std::output_iterator_tag, T, ptrdiff_t, T*, T&>
: public std::iterator<std::output_iterator_tag, T, std::ptrdiff_t, T*, T&>
{
typedef OutputContainer<T> ContainerType;
T* ptr;
@ -179,7 +179,7 @@ namespace __gnu_test
*/
template<class T>
class input_iterator_wrapper
: public std::iterator<std::input_iterator_tag, T, ptrdiff_t, T*, T&>
: public std::iterator<std::input_iterator_tag, T, std::ptrdiff_t, T*, T&>
{
protected:
input_iterator_wrapper()
@ -435,7 +435,7 @@ namespace __gnu_test
}
random_access_iterator_wrapper&
operator+=(ptrdiff_t n)
operator+=(std::ptrdiff_t n)
{
if(n > 0)
{
@ -451,17 +451,17 @@ namespace __gnu_test
}
random_access_iterator_wrapper&
operator-=(ptrdiff_t n)
operator-=(std::ptrdiff_t n)
{ return *this += -n; }
random_access_iterator_wrapper
operator-(ptrdiff_t n) const
operator-(std::ptrdiff_t n) const
{
random_access_iterator_wrapper<T> tmp = *this;
return tmp -= n;
}
ptrdiff_t
std::ptrdiff_t
operator-(const random_access_iterator_wrapper<T>& in) const
{
ITERATOR_VERIFY(this->SharedInfo == in.SharedInfo);
@ -469,7 +469,7 @@ namespace __gnu_test
}
T&
operator[](ptrdiff_t n) const
operator[](std::ptrdiff_t n) const
{ return *(*this + n); }
bool
@ -500,12 +500,12 @@ namespace __gnu_test
template<typename T>
random_access_iterator_wrapper<T>
operator+(random_access_iterator_wrapper<T> it, ptrdiff_t n)
operator+(random_access_iterator_wrapper<T> it, std::ptrdiff_t n)
{ return it += n; }
template<typename T>
random_access_iterator_wrapper<T>
operator+(ptrdiff_t n, random_access_iterator_wrapper<T> it)
operator+(std::ptrdiff_t n, random_access_iterator_wrapper<T> it)
{ return it += n; }