diff options
Diffstat (limited to 'libstdc++-v3/include/bits')
-rw-r--r-- | libstdc++-v3/include/bits/basic_string.tcc | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/boost_concept_check.h | 5 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/c++config | 17 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/fstream.tcc | 16 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/functional_hash.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/locale_facets.h | 20 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/locale_facets.tcc | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/locale_facets_nonio.h | 47 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/locale_facets_nonio.tcc | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/move.h | 1 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_algobase.h | 1 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_iterator_base_types.h | 1 |
12 files changed, 68 insertions, 52 deletions
diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index d450a47..ab71ad6 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -1,7 +1,7 @@ // Components for manipulating sequences of characters -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009 +// 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -130,7 +130,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #endif // NB: Not required, but considered best practice. if (__gnu_cxx::__is_null_pointer(__beg) && __beg != __end) - __throw_logic_error(__N("basic_string::_S_construct NULL not valid")); + __throw_logic_error(__N("basic_string::_S_construct null not valid")); const size_type __dnew = static_cast<size_type>(std::distance(__beg, __end)); diff --git a/libstdc++-v3/include/bits/boost_concept_check.h b/libstdc++-v3/include/bits/boost_concept_check.h index 054fcf2..cffd7fb 100644 --- a/libstdc++-v3/include/bits/boost_concept_check.h +++ b/libstdc++-v3/include/bits/boost_concept_check.h @@ -1,6 +1,7 @@ // -*- C++ -*- -// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007, 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 @@ -41,7 +42,7 @@ #pragma GCC system_header -#include <cstddef> // for ptrdiff_t, used next +#include <bits/c++config.h> #include <bits/stl_iterator_base_types.h> // for traits and tags _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 3746696..9dc9ac2 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -1,7 +1,7 @@ // Predefined symbols and macros -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// 2006, 2007, 2008, 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 @@ -376,4 +376,19 @@ _GLIBCXX_END_NAMESPACE # endif #endif +#ifdef __cplusplus + +_GLIBCXX_BEGIN_NAMESPACE(std) + + typedef __SIZE_TYPE__ size_t; + typedef __PTRDIFF_TYPE__ ptrdiff_t; + +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + typedef decltype(nullptr) nullptr_t; +#endif + +_GLIBCXX_END_NAMESPACE + +#endif // __cplusplus + // End of prewritten config; the discovered settings follow. diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index c5f7f8c..c498f48 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -64,21 +64,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std) if (_M_buf_allocated) { delete [] _M_buf; - _M_buf = NULL; + _M_buf = 0; _M_buf_allocated = false; } delete [] _M_ext_buf; - _M_ext_buf = NULL; + _M_ext_buf = 0; _M_ext_buf_size = 0; - _M_ext_next = NULL; - _M_ext_end = NULL; + _M_ext_next = 0; + _M_ext_end = 0; } template<typename _CharT, typename _Traits> basic_filebuf<_CharT, _Traits>:: basic_filebuf() : __streambuf_type(), _M_lock(), _M_file(&_M_lock), _M_mode(ios_base::openmode(0)), _M_state_beg(), _M_state_cur(), - _M_state_last(), _M_buf(NULL), _M_buf_size(BUFSIZ), + _M_state_last(), _M_buf(0), _M_buf_size(BUFSIZ), _M_buf_allocated(false), _M_reading(false), _M_writing(false), _M_pback(), _M_pback_cur_save(0), _M_pback_end_save(0), _M_pback_init(false), _M_codecvt(0), _M_ext_buf(0), _M_ext_buf_size(0), _M_ext_next(0), @@ -93,7 +93,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) basic_filebuf<_CharT, _Traits>:: open(const char* __s, ios_base::openmode __mode) { - __filebuf_type *__ret = NULL; + __filebuf_type *__ret = 0; if (!this->is_open()) { _M_file.open(__s, __mode); @@ -128,7 +128,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) close() { if (!this->is_open()) - return NULL; + return 0; bool __testfail = false; { @@ -167,7 +167,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __testfail = true; if (__testfail) - return NULL; + return 0; else return this; } diff --git a/libstdc++-v3/include/bits/functional_hash.h b/libstdc++-v3/include/bits/functional_hash.h index aaa05aa..a207ffa 100644 --- a/libstdc++-v3/include/bits/functional_hash.h +++ b/libstdc++-v3/include/bits/functional_hash.h @@ -32,7 +32,7 @@ #pragma GCC system_header -#include <cstddef> +#include <bits/c++config.h> #include <bits/stl_function.h> namespace std diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 2e18f7d..79bfd03 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -1587,12 +1587,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) bool _M_allocated; - __numpunct_cache(size_t __refs = 0) : facet(__refs), - _M_grouping(NULL), _M_grouping_size(0), _M_use_grouping(false), - _M_truename(NULL), _M_truename_size(0), _M_falsename(NULL), - _M_falsename_size(0), _M_decimal_point(_CharT()), - _M_thousands_sep(_CharT()), _M_allocated(false) - { } + __numpunct_cache(size_t __refs = 0) + : facet(__refs), _M_grouping(0), _M_grouping_size(0), + _M_use_grouping(false), + _M_truename(0), _M_truename_size(0), _M_falsename(0), + _M_falsename_size(0), _M_decimal_point(_CharT()), + _M_thousands_sep(_CharT()), _M_allocated(false) + { } ~__numpunct_cache(); @@ -1657,7 +1658,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param refs Refcount to pass to the base class. */ explicit - numpunct(size_t __refs = 0) : facet(__refs), _M_data(NULL) + numpunct(size_t __refs = 0) + : facet(__refs), _M_data(0) { _M_initialize_numpunct(); } /** @@ -1685,7 +1687,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ explicit numpunct(__c_locale __cloc, size_t __refs = 0) - : facet(__refs), _M_data(NULL) + : facet(__refs), _M_data(0) { _M_initialize_numpunct(__cloc); } /** @@ -1841,7 +1843,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // For use at construction time only. void - _M_initialize_numpunct(__c_locale __cloc = NULL); + _M_initialize_numpunct(__c_locale __cloc = 0); }; template<typename _CharT> diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 1608e2c..52bafd3 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1,7 +1,7 @@ // Locale support -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009 +// 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -56,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const locale::facet** __caches = __loc._M_impl->_M_caches; if (!__caches[__i]) { - __numpunct_cache<_CharT>* __tmp = NULL; + __numpunct_cache<_CharT>* __tmp = 0; __try { __tmp = new __numpunct_cache<_CharT>; diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.h b/libstdc++-v3/include/bits/locale_facets_nonio.h index a25e0ac..fdc810d 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.h +++ b/libstdc++-v3/include/bits/locale_facets_nonio.h @@ -118,20 +118,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std) bool _M_allocated; __timepunct_cache(size_t __refs = 0) : facet(__refs), - _M_date_format(NULL), _M_date_era_format(NULL), _M_time_format(NULL), - _M_time_era_format(NULL), _M_date_time_format(NULL), - _M_date_time_era_format(NULL), _M_am(NULL), _M_pm(NULL), - _M_am_pm_format(NULL), _M_day1(NULL), _M_day2(NULL), _M_day3(NULL), - _M_day4(NULL), _M_day5(NULL), _M_day6(NULL), _M_day7(NULL), - _M_aday1(NULL), _M_aday2(NULL), _M_aday3(NULL), _M_aday4(NULL), - _M_aday5(NULL), _M_aday6(NULL), _M_aday7(NULL), _M_month01(NULL), - _M_month02(NULL), _M_month03(NULL), _M_month04(NULL), _M_month05(NULL), - _M_month06(NULL), _M_month07(NULL), _M_month08(NULL), _M_month09(NULL), - _M_month10(NULL), _M_month11(NULL), _M_month12(NULL), _M_amonth01(NULL), - _M_amonth02(NULL), _M_amonth03(NULL), _M_amonth04(NULL), - _M_amonth05(NULL), _M_amonth06(NULL), _M_amonth07(NULL), - _M_amonth08(NULL), _M_amonth09(NULL), _M_amonth10(NULL), - _M_amonth11(NULL), _M_amonth12(NULL), _M_allocated(false) + _M_date_format(0), _M_date_era_format(0), _M_time_format(0), + _M_time_era_format(0), _M_date_time_format(0), + _M_date_time_era_format(0), _M_am(0), _M_pm(0), + _M_am_pm_format(0), _M_day1(0), _M_day2(0), _M_day3(0), + _M_day4(0), _M_day5(0), _M_day6(0), _M_day7(0), + _M_aday1(0), _M_aday2(0), _M_aday3(0), _M_aday4(0), + _M_aday5(0), _M_aday6(0), _M_aday7(0), _M_month01(0), + _M_month02(0), _M_month03(0), _M_month04(0), _M_month05(0), + _M_month06(0), _M_month07(0), _M_month08(0), _M_month09(0), + _M_month10(0), _M_month11(0), _M_month12(0), _M_amonth01(0), + _M_amonth02(0), _M_amonth03(0), _M_amonth04(0), + _M_amonth05(0), _M_amonth06(0), _M_amonth07(0), + _M_amonth08(0), _M_amonth09(0), _M_amonth10(0), + _M_amonth11(0), _M_amonth12(0), _M_allocated(false) { } ~__timepunct_cache(); @@ -313,7 +313,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // For use at construction time only. void - _M_initialize_timepunct(__c_locale __cloc = NULL); + _M_initialize_timepunct(__c_locale __cloc = 0); }; template<typename _CharT> @@ -883,11 +883,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) bool _M_allocated; __moneypunct_cache(size_t __refs = 0) : facet(__refs), - _M_grouping(NULL), _M_grouping_size(0), _M_use_grouping(false), + _M_grouping(0), _M_grouping_size(0), _M_use_grouping(false), _M_decimal_point(_CharT()), _M_thousands_sep(_CharT()), - _M_curr_symbol(NULL), _M_curr_symbol_size(0), - _M_positive_sign(NULL), _M_positive_sign_size(0), - _M_negative_sign(NULL), _M_negative_sign_size(0), + _M_curr_symbol(0), _M_curr_symbol_size(0), + _M_positive_sign(0), _M_positive_sign_size(0), + _M_negative_sign(0), _M_negative_sign_size(0), _M_frac_digits(0), _M_pos_format(money_base::pattern()), _M_neg_format(money_base::pattern()), _M_allocated(false) @@ -955,7 +955,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * @param refs Passed to the base facet class. */ explicit - moneypunct(size_t __refs = 0) : facet(__refs), _M_data(NULL) + moneypunct(size_t __refs = 0) + : facet(__refs), _M_data(0) { _M_initialize_moneypunct(); } /** @@ -983,7 +984,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ explicit moneypunct(__c_locale __cloc, const char* __s, size_t __refs = 0) - : facet(__refs), _M_data(NULL) + : facet(__refs), _M_data(0) { _M_initialize_moneypunct(__cloc, __s); } /** @@ -1271,8 +1272,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // For use at construction time only. void - _M_initialize_moneypunct(__c_locale __cloc = NULL, - const char* __name = NULL); + _M_initialize_moneypunct(__c_locale __cloc = 0, + const char* __name = 0); }; template<typename _CharT, bool _Intl> diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.tcc b/libstdc++-v3/include/bits/locale_facets_nonio.tcc index 48a9139..b5c77b9 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc @@ -44,7 +44,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const locale::facet** __caches = __loc._M_impl->_M_caches; if (!__caches[__i]) { - __moneypunct_cache<_CharT, _Intl>* __tmp = NULL; + __moneypunct_cache<_CharT, _Intl>* __tmp = 0; __try { __tmp = new __moneypunct_cache<_CharT, _Intl>; diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h index a137f98..98755dc 100644 --- a/libstdc++-v3/include/bits/move.h +++ b/libstdc++-v3/include/bits/move.h @@ -31,7 +31,6 @@ #define _MOVE_H 1 #include <bits/c++config.h> -#include <cstddef> #include <bits/concept_check.h> _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 0489c41..fc3047b 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -58,7 +58,6 @@ #define _STL_ALGOBASE_H 1 #include <bits/c++config.h> -#include <cstddef> #include <bits/functexcept.h> #include <bits/cpp_type_traits.h> #include <ext/type_traits.h> diff --git a/libstdc++-v3/include/bits/stl_iterator_base_types.h b/libstdc++-v3/include/bits/stl_iterator_base_types.h index 07687bd..d934f43 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_types.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h @@ -63,7 +63,6 @@ #pragma GCC system_header #include <bits/c++config.h> -#include <cstddef> _GLIBCXX_BEGIN_NAMESPACE(std) |