This fixes some warnings when building the library with -Wpedantic (some only show up when also building with -Wsystem-headers).
Tested x86_64-linux, committed to trunk.
commit bf385e3ea2d8d10bdaa8e41c7638d32eb26b9bfd Author: Jonathan Wakely <jwak...@redhat.com> Date: Tue Jun 24 14:16:28 2014 +0100 * include/bits/functexcept.h (__throw_out_of_range_fmt): Change attribute to __gnu_printf__ archetype to prevent warnings for "%zu". * include/bits/locale_facets_nonio.tcc (time_get::do_get_weekday): Remove unused typedef. (time_get::do_get_monthname): Likewise. * include/bits/stl_tree.h: Add system_header pragma. * include/ext/stdio_sync_filebuf.h (stdio_sync_filebuf::file): Remove redundant const-qualifier. * include/std/complex (complex::__rep): Use _GLIBCXX_CONSTEXPR macro instead of _GLIBCXX_USE_CONSTEXPR. diff --git a/libstdc++-v3/include/bits/functexcept.h b/libstdc++-v3/include/bits/functexcept.h index b8359f9..48be255 100644 --- a/libstdc++-v3/include/bits/functexcept.h +++ b/libstdc++-v3/include/bits/functexcept.h @@ -76,7 +76,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void __throw_out_of_range_fmt(const char*, ...) __attribute__((__noreturn__)) - __attribute__((__format__(__printf__, 1, 2))); + __attribute__((__format__(__gnu_printf__, 1, 2))); void __throw_runtime_error(const char*) __attribute__((__noreturn__)); diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.tcc b/libstdc++-v3/include/bits/locale_facets_nonio.tcc index 41d944d..c9f8dac 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc +++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc @@ -1064,7 +1064,6 @@ _GLIBCXX_END_NAMESPACE_LDBL do_get_weekday(iter_type __beg, iter_type __end, ios_base& __io, ios_base::iostate& __err, tm* __tm) const { - typedef char_traits<_CharT> __traits_type; const locale& __loc = __io._M_getloc(); const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc); const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); @@ -1092,7 +1091,6 @@ _GLIBCXX_END_NAMESPACE_LDBL do_get_monthname(iter_type __beg, iter_type __end, ios_base& __io, ios_base::iostate& __err, tm* __tm) const { - typedef char_traits<_CharT> __traits_type; const locale& __loc = __io._M_getloc(); const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc); const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index ce43ab8..cc9bf94 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -58,6 +58,8 @@ #ifndef _STL_TREE_H #define _STL_TREE_H 1 +#pragma GCC system_header + #include <bits/stl_algobase.h> #include <bits/allocator.h> #include <bits/stl_function.h> diff --git a/libstdc++-v3/include/ext/stdio_sync_filebuf.h b/libstdc++-v3/include/ext/stdio_sync_filebuf.h index 5ca16eb..73283a7 100644 --- a/libstdc++-v3/include/ext/stdio_sync_filebuf.h +++ b/libstdc++-v3/include/ext/stdio_sync_filebuf.h @@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Note that there is no way for the library to track what you do * with the file, so be careful. */ - std::__c_file* const + std::__c_file* file() { return this->_M_file; } protected: diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index 5849cd5..1ae6c45 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -217,7 +217,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Up> complex<_Tp>& operator/=(const complex<_Up>&); - _GLIBCXX_USE_CONSTEXPR complex __rep() const + _GLIBCXX_CONSTEXPR complex __rep() const { return *this; } private: @@ -1180,7 +1180,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } - _GLIBCXX_USE_CONSTEXPR _ComplexT __rep() const { return _M_value; } + _GLIBCXX_CONSTEXPR _ComplexT __rep() const { return _M_value; } private: _ComplexT _M_value; @@ -1330,7 +1330,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } - _GLIBCXX_USE_CONSTEXPR _ComplexT __rep() const { return _M_value; } + _GLIBCXX_CONSTEXPR _ComplexT __rep() const { return _M_value; } private: _ComplexT _M_value; @@ -1482,7 +1482,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } - _GLIBCXX_USE_CONSTEXPR _ComplexT __rep() const { return _M_value; } + _GLIBCXX_CONSTEXPR _ComplexT __rep() const { return _M_value; } private: _ComplexT _M_value;