+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,
#include <cstdio>
#include <locale>
#include <limits>
-#include <cstddef>
#ifdef _GLIBCXX_HAVE_IEEEFP_H
#include <ieeefp.h>
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);
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);
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);
{
// 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"));
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()
// 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
#pragma GCC system_header
#include <clocale>
-#include <cstddef>
#define _GLIBCXX_NUM_CATEGORIES 0
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;
// 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
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
_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);
_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);
// 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
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();
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)
{
// 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
#pragma GCC system_header
#include <clocale>
-#include <cstddef>
#define _GLIBCXX_C_LOCALE_GNU 1
#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;
// 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
// 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))
// 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
__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);
__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);
// 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
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)
{
__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);
__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);
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);
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);
// 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
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)
{
-// 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
#include <typeinfo>
#include <exception>
-#include <cstddef>
#include "unwind.h"
#include <testsuite_hooks.h>
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 );
}
}
// { 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
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;
}
-// 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
bool test __attribute__((unused)) = true;
wostringstream stream;
- time_t tt = time(NULL);
+ time_t tt = time(0);
const wchar_t* fmt = L"%c";
-// 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
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(),
-// 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
bool test __attribute__((unused)) = true;
wostringstream stream;
- time_t tt = time(NULL);
+ time_t tt = time(0);
const wchar_t* fmt = L"%c";
#include <list>
#include <cstdlib>
-#include <cstddef>
#include <pthread.h>
const int thread_cycles = 10;
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 ()
{
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];
}
}
#include <string>
#include <map>
#include <vector>
-#include <cstddef>
#include <pthread.h>
const int max_thread_count = 8;
#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;
}
#include <list>
#include <string>
#include <stdexcept>
-#include <cstddef>
#include <clocale>
#include <cstdlib>
#include <locale>
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
*/
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;
*/
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()
}
random_access_iterator_wrapper&
- operator+=(ptrdiff_t n)
+ operator+=(std::ptrdiff_t n)
{
if(n > 0)
{
}
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);
}
T&
- operator[](ptrdiff_t n) const
+ operator[](std::ptrdiff_t n) const
{ return *(*this + n); }
bool
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; }
projects / thirdparty / gcc.git / commitdiff
