From 57c51668eefc148c91e68dcec298f0615b52e38a Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Wed, 19 Jul 2017 16:59:00 +0000 Subject: [PATCH] new (bad_array_new_length): Remove redundant semicolon after in-class member function definition. * libsupc++/new (bad_array_new_length): Remove redundant semicolon after in-class member function definition. * include/bits/locale_facets.h (ctype_byname, num_put): Likewise. * include/bits/locale_facets_nonio.h (time_put_byname): Likewise. * include/bits/random.h (mersenne_twister_engine): Likewise. * include/tr1/random.h (mersenne_twister): Likewise * include/ext/random (simd_fast_mersenne_twister_engine): Likewise. * include/ext/rope (char_producer, _Rope_char_consumer, _Rope_self_destruct_ptr, _Rope_const_iterator, _Rope_iterator): Likewise. * include/ext/ropeimpl.h (_Rope_flatten_char_consumer, _Rope_insert_char_consumer): Likewise. From-SVN: r250357 --- libstdc++-v3/ChangeLog | 15 +++++++++++++++ libstdc++-v3/include/bits/locale_facets.h | 4 ++-- libstdc++-v3/include/bits/locale_facets_nonio.h | 2 +- libstdc++-v3/include/bits/random.h | 2 +- libstdc++-v3/include/ext/random | 2 +- libstdc++-v3/include/ext/rope | 12 ++++++------ libstdc++-v3/include/ext/ropeimpl.h | 6 +++--- libstdc++-v3/include/tr1/random.h | 2 +- libstdc++-v3/libsupc++/new | 2 +- 9 files changed, 31 insertions(+), 16 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9ac3fcaf79e..828f7ada474 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2017-07-19 Volker Reichelt + + * libsupc++/new (bad_array_new_length): Remove redundant + semicolon after in-class member function definition. + * include/bits/locale_facets.h (ctype_byname, num_put): Likewise. + * include/bits/locale_facets_nonio.h (time_put_byname): Likewise. + * include/bits/random.h (mersenne_twister_engine): Likewise. + * include/tr1/random.h (mersenne_twister): Likewise + * include/ext/random (simd_fast_mersenne_twister_engine): Likewise. + * include/ext/rope (char_producer, _Rope_char_consumer, + _Rope_self_destruct_ptr, _Rope_const_iterator, _Rope_iterator): + Likewise. + * include/ext/ropeimpl.h (_Rope_flatten_char_consumer, + _Rope_insert_char_consumer): Likewise. + 2017-07-19 Jonathan Wakely * include/bits/fstream.tcc (basic_filebuf::xsgetn) diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 1ad0eb5ab66..9a74677b393 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -1487,7 +1487,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION protected: virtual - ~ctype_byname() { }; + ~ctype_byname() { } }; /// 22.2.1.4 Class ctype_byname specializations. @@ -2486,7 +2486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL /// Destructor. virtual - ~num_put() { }; + ~num_put() { } //@{ /** diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.h b/libstdc++-v3/include/bits/locale_facets_nonio.h index 0cd307fb5ed..0068cd3addd 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.h +++ b/libstdc++-v3/include/bits/locale_facets_nonio.h @@ -898,7 +898,7 @@ _GLIBCXX_END_NAMESPACE_CXX11 explicit time_put_byname(const char*, size_t __refs = 0) : time_put<_CharT, _OutIter>(__refs) - { }; + { } #if __cplusplus >= 201103L explicit diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index bb761ec8fb0..be2b4a6a517 100644 --- a/libstdc++-v3/include/bits/random.h +++ b/libstdc++-v3/include/bits/random.h @@ -520,7 +520,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ static constexpr result_type min() - { return 0; }; + { return 0; } /** * @brief Gets the largest possible value in the output range. diff --git a/libstdc++-v3/include/ext/random b/libstdc++-v3/include/ext/random index d93757b08dd..c991345886f 100644 --- a/libstdc++-v3/include/ext/random +++ b/libstdc++-v3/include/ext/random @@ -112,7 +112,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static constexpr result_type min() - { return 0; }; + { return 0; } static constexpr result_type max() diff --git a/libstdc++-v3/include/ext/rope b/libstdc++-v3/include/ext/rope index 785205cb2b5..d97b57ff415 100644 --- a/libstdc++-v3/include/ext/rope +++ b/libstdc++-v3/include/ext/rope @@ -150,7 +150,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION class char_producer { public: - virtual ~char_producer() { }; + virtual ~char_producer() { } virtual void operator()(size_t __start_pos, size_t __len, @@ -314,7 +314,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // compile-time would do. Hence this should all be private // for now. // The symmetry with char_producer is accidental and temporary. - virtual ~_Rope_char_consumer() { }; + virtual ~_Rope_char_consumer() { } virtual bool operator()(const _CharT* __buffer, size_t __len) = 0; @@ -924,9 +924,9 @@ protected: ~_Rope_self_destruct_ptr() { _Rope_RopeRep<_CharT, _Alloc>::_S_unref(_M_ptr); } #if __cpp_exceptions - _Rope_self_destruct_ptr() : _M_ptr(0) { }; + _Rope_self_destruct_ptr() : _M_ptr(0) { } #else - _Rope_self_destruct_ptr() { }; + _Rope_self_destruct_ptr() { } #endif _Rope_self_destruct_ptr(_Rope_RopeRep<_CharT, _Alloc>* __p) : _M_ptr(__p) { } @@ -1153,7 +1153,7 @@ protected: typedef const _CharT* pointer; public: - _Rope_const_iterator() { }; + _Rope_const_iterator() { } _Rope_const_iterator(const _Rope_const_iterator& __x) : _Rope_iterator_base<_CharT,_Alloc>(__x) { } @@ -1325,7 +1325,7 @@ protected: _Rope_iterator() { this->_M_root = 0; // Needed for reference counting. - }; + } _Rope_iterator(const _Rope_iterator& __x) : _Rope_iterator_base<_CharT, _Alloc>(__x) diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h index 471b13f4f95..9e88ce14c18 100644 --- a/libstdc++-v3/include/ext/ropeimpl.h +++ b/libstdc++-v3/include/ext/ropeimpl.h @@ -844,7 +844,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION public: _Rope_flatten_char_consumer(_CharT* __buffer) - { _M_buf_ptr = __buffer; }; + { _M_buf_ptr = __buffer; } ~_Rope_flatten_char_consumer() {} @@ -897,8 +897,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Insert_ostream& _M_o; public: _Rope_insert_char_consumer(_Insert_ostream& __writer) - : _M_o(__writer) {}; - ~_Rope_insert_char_consumer() { }; + : _M_o(__writer) {} + ~_Rope_insert_char_consumer() { } // Caller is presumed to own the ostream bool operator() (const _CharT* __leaf, size_t __n); // Returns true to continue traversal. diff --git a/libstdc++-v3/include/tr1/random.h b/libstdc++-v3/include/tr1/random.h index 67654a8bb8f..9fe7fae900f 100644 --- a/libstdc++-v3/include/tr1/random.h +++ b/libstdc++-v3/include/tr1/random.h @@ -594,7 +594,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION result_type min() const - { return 0; }; + { return 0; } result_type max() const diff --git a/libstdc++-v3/libsupc++/new b/libstdc++-v3/libsupc++/new index 04f172cebd0..795b33c4e6a 100644 --- a/libstdc++-v3/libsupc++/new +++ b/libstdc++-v3/libsupc++/new @@ -68,7 +68,7 @@ namespace std class bad_array_new_length : public bad_alloc { public: - bad_array_new_length() throw() { }; + bad_array_new_length() throw() { } // This declaration is not useless: // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118