From 6fc2643ae1a09d48d0c8a804d50559025539664c Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 9 May 2018 19:53:41 +0200 Subject: [PATCH] Use override in the bundled boost where possible --- bundled/boost-1.62.0/include/boost/any.hpp | 6 ++-- .../boost/archive/archive_exception.hpp | 4 +-- .../boost/archive/basic_text_iarchive.hpp | 2 +- .../boost/archive/basic_text_oarchive.hpp | 2 +- .../boost/archive/basic_xml_iarchive.hpp | 2 +- .../boost/archive/basic_xml_oarchive.hpp | 2 +- .../include/boost/archive/codecvt_null.hpp | 14 +++++----- .../boost/archive/detail/common_iarchive.hpp | 12 ++++---- .../boost/archive/detail/common_oarchive.hpp | 16 +++++------ .../boost/archive/detail/iserializer.hpp | 22 +++++++-------- .../boost/archive/detail/oserializer.hpp | 18 ++++++------ .../archive/iterators/dataflow_exception.hpp | 2 +- .../boost/archive/polymorphic_iarchive.hpp | 2 +- .../boost/archive/polymorphic_oarchive.hpp | 2 +- .../include/boost/archive/text_iarchive.hpp | 4 +-- .../include/boost/archive/text_oarchive.hpp | 4 +-- .../include/boost/archive/text_wiarchive.hpp | 4 +-- .../include/boost/archive/text_woarchive.hpp | 2 +- .../boost/archive/xml_archive_exception.hpp | 2 +- .../include/boost/archive/xml_iarchive.hpp | 4 +-- .../include/boost/archive/xml_oarchive.hpp | 4 +-- .../include/boost/archive/xml_wiarchive.hpp | 4 +-- .../include/boost/archive/xml_woarchive.hpp | 4 +-- .../boost/detail/utf8_codecvt_facet.hpp | 15 +++++----- .../include/boost/format/exceptions.hpp | 10 +++---- .../detail/streambuf/indirect_streambuf.hpp | 28 +++++++++---------- .../boost/iostreams/filtering_stream.hpp | 2 +- .../include/boost/iostreams/stream_buffer.hpp | 2 +- .../boost/lexical_cast/bad_lexical_cast.hpp | 4 +-- .../numeric/conversion/converter_policies.hpp | 6 ++-- .../detail/file_parser_error.hpp | 2 +- .../boost/property_tree/detail/rapidxml.hpp | 2 +- .../boost/property_tree/exceptions.hpp | 6 ++-- .../extended_type_info_no_rtti.hpp | 14 +++++----- .../extended_type_info_typeid.hpp | 14 +++++----- .../include/boost/serialization/singleton.hpp | 2 +- .../include/boost/serialization/void_cast.hpp | 16 +++++------ .../include/boost/signals2/connection.hpp | 10 +++---- .../boost/signals2/detail/foreign_ptr.hpp | 8 +++--- .../boost/signals2/detail/signal_template.hpp | 4 +-- .../include/boost/signals2/expired_slot.hpp | 2 +- .../include/boost/signals2/last_value.hpp | 2 +- .../include/boost/smart_ptr/bad_weak_ptr.hpp | 2 +- .../smart_ptr/detail/array_count_impl.hpp | 8 +++--- .../smart_ptr/detail/sp_counted_impl.hpp | 20 ++++++------- .../classic/core/non_terminal/impl/rule.ipp | 6 ++-- .../boost/system/detail/error_code.ipp | 10 +++---- .../include/boost/variant/bad_visit.hpp | 2 +- .../include/boost/variant/get.hpp | 2 +- .../libs/serialization/src/basic_oarchive.cpp | 10 +++---- .../serialization/src/extended_type_info.cpp | 12 ++++---- .../src/extended_type_info_typeid.cpp | 6 ++-- .../libs/serialization/src/void_cast.cpp | 16 +++++------ 53 files changed, 191 insertions(+), 190 deletions(-) diff --git a/bundled/boost-1.62.0/include/boost/any.hpp b/bundled/boost-1.62.0/include/boost/any.hpp index 437de2c023..38c665a96c 100644 --- a/bundled/boost-1.62.0/include/boost/any.hpp +++ b/bundled/boost-1.62.0/include/boost/any.hpp @@ -182,12 +182,12 @@ namespace boost #endif public: // queries - virtual const boost::typeindex::type_info& type() const BOOST_NOEXCEPT + virtual const boost::typeindex::type_info& type() const BOOST_NOEXCEPT override { return boost::typeindex::type_id().type_info(); } - virtual placeholder * clone() const + virtual placeholder * clone() const override { return new holder(held); } @@ -233,7 +233,7 @@ namespace boost #endif { public: - virtual const char * what() const BOOST_NOEXCEPT_OR_NOTHROW + virtual const char * what() const BOOST_NOEXCEPT_OR_NOTHROW override { return "boost::bad_any_cast: " "failed conversion using boost::any_cast"; diff --git a/bundled/boost-1.62.0/include/boost/archive/archive_exception.hpp b/bundled/boost-1.62.0/include/boost/archive/archive_exception.hpp index fabcdb5fa7..ce69e99891 100644 --- a/bundled/boost-1.62.0/include/boost/archive/archive_exception.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/archive_exception.hpp @@ -88,8 +88,8 @@ public: const char * e2 = NULL ) BOOST_NOEXCEPT; BOOST_ARCHIVE_DECL archive_exception(archive_exception const &) BOOST_NOEXCEPT ; - virtual BOOST_ARCHIVE_DECL ~archive_exception() BOOST_NOEXCEPT_OR_NOTHROW ; - virtual BOOST_ARCHIVE_DECL const char * what() const BOOST_NOEXCEPT_OR_NOTHROW ; + virtual BOOST_ARCHIVE_DECL ~archive_exception() BOOST_NOEXCEPT_OR_NOTHROW override ; + virtual BOOST_ARCHIVE_DECL const char * what() const BOOST_NOEXCEPT_OR_NOTHROW override ; }; }// namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/basic_text_iarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/basic_text_iarchive.hpp index 583041d8b4..936e3ecd13 100644 --- a/bundled/boost-1.62.0/include/boost/archive/basic_text_iarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/basic_text_iarchive.hpp @@ -81,7 +81,7 @@ protected: basic_text_iarchive(unsigned int flags) : detail::common_iarchive(flags) {} - ~basic_text_iarchive(){} + ~basic_text_iarchive() override{} }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/basic_text_oarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/basic_text_oarchive.hpp index 6f7f8fb167..454a20d07a 100644 --- a/bundled/boost-1.62.0/include/boost/archive/basic_text_oarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/basic_text_oarchive.hpp @@ -104,7 +104,7 @@ protected: detail::common_oarchive(flags), delimiter(none) {} - ~basic_text_oarchive(){} + ~basic_text_oarchive() override{} }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/basic_xml_iarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/basic_xml_iarchive.hpp index a882df5615..5f46f3c871 100644 --- a/bundled/boost-1.62.0/include/boost/archive/basic_xml_iarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/basic_xml_iarchive.hpp @@ -105,7 +105,7 @@ protected: BOOST_ARCHIVE_OR_WARCHIVE_DECL basic_xml_iarchive(unsigned int flags); BOOST_ARCHIVE_OR_WARCHIVE_DECL - ~basic_xml_iarchive(); + ~basic_xml_iarchive() override; }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/basic_xml_oarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/basic_xml_oarchive.hpp index 107fca4ec6..740a7ecfee 100644 --- a/bundled/boost-1.62.0/include/boost/archive/basic_xml_oarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/basic_xml_oarchive.hpp @@ -123,7 +123,7 @@ protected: BOOST_ARCHIVE_OR_WARCHIVE_DECL basic_xml_oarchive(unsigned int flags); BOOST_ARCHIVE_OR_WARCHIVE_DECL - ~basic_xml_oarchive(); + ~basic_xml_oarchive() override; }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/codecvt_null.hpp b/bundled/boost-1.62.0/include/boost/archive/codecvt_null.hpp index 9cc9e5729d..f27e1b467b 100644 --- a/bundled/boost-1.62.0/include/boost/archive/codecvt_null.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/codecvt_null.hpp @@ -49,14 +49,14 @@ class codecvt_null; template<> class codecvt_null : public std::codecvt { - virtual bool do_always_noconv() const throw() { + virtual bool do_always_noconv() const throw() override { return true; } public: explicit codecvt_null(std::size_t no_locale_manage = 0) : std::codecvt(no_locale_manage) {} - virtual ~codecvt_null(){}; + virtual ~codecvt_null() override{}; }; template<> @@ -71,7 +71,7 @@ class BOOST_SYMBOL_VISIBLE codecvt_null : public std::codecvt : public std::codecvt(no_locale_manage) {} - virtual ~codecvt_null(){}; + virtual ~codecvt_null() override{}; }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/detail/common_iarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/detail/common_iarchive.hpp index 82304f1e5a..43e86e74eb 100644 --- a/bundled/boost-1.62.0/include/boost/archive/detail/common_iarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/detail/common_iarchive.hpp @@ -41,22 +41,22 @@ class BOOST_SYMBOL_VISIBLE common_iarchive : { friend class interface_iarchive; private: - virtual void vload(version_type & t){ + virtual void vload(version_type & t) override{ * this->This() >> t; } - virtual void vload(object_id_type & t){ + virtual void vload(object_id_type & t) override{ * this->This() >> t; } - virtual void vload(class_id_type & t){ + virtual void vload(class_id_type & t) override{ * this->This() >> t; } - virtual void vload(class_id_optional_type & t){ + virtual void vload(class_id_optional_type & t) override{ * this->This() >> t; } - virtual void vload(tracking_type & t){ + virtual void vload(tracking_type & t) override{ * this->This() >> t; } - virtual void vload(class_name_type &s){ + virtual void vload(class_name_type &s) override{ * this->This() >> s; } protected: diff --git a/bundled/boost-1.62.0/include/boost/archive/detail/common_oarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/detail/common_oarchive.hpp index ee42bbe597..5df48e91c8 100644 --- a/bundled/boost-1.62.0/include/boost/archive/detail/common_oarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/detail/common_oarchive.hpp @@ -39,28 +39,28 @@ class BOOST_SYMBOL_VISIBLE common_oarchive : { friend class interface_oarchive; private: - virtual void vsave(const version_type t){ + virtual void vsave(const version_type t) override{ * this->This() << t; } - virtual void vsave(const object_id_type t){ + virtual void vsave(const object_id_type t) override{ * this->This() << t; } - virtual void vsave(const object_reference_type t){ + virtual void vsave(const object_reference_type t) override{ * this->This() << t; } - virtual void vsave(const class_id_type t){ + virtual void vsave(const class_id_type t) override{ * this->This() << t; } - virtual void vsave(const class_id_reference_type t){ + virtual void vsave(const class_id_reference_type t) override{ * this->This() << t; } - virtual void vsave(const class_id_optional_type t){ + virtual void vsave(const class_id_optional_type t) override{ * this->This() << t; } - virtual void vsave(const class_name_type & t){ + virtual void vsave(const class_name_type & t) override{ * this->This() << t; } - virtual void vsave(const tracking_type t){ + virtual void vsave(const tracking_type t) override{ * this->This() << t; } protected: diff --git a/bundled/boost-1.62.0/include/boost/archive/detail/iserializer.hpp b/bundled/boost-1.62.0/include/boost/archive/detail/iserializer.hpp index bf230a813b..f0bf622af6 100644 --- a/bundled/boost-1.62.0/include/boost/archive/detail/iserializer.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/detail/iserializer.hpp @@ -116,7 +116,7 @@ template class iserializer : public basic_iserializer { private: - virtual void destroy(/*const*/ void *address) const { + virtual void destroy(/*const*/ void *address) const override { boost::serialization::access::destroy(static_cast(address)); } protected: @@ -134,25 +134,25 @@ public: basic_iarchive & ar, void *x, const unsigned int file_version - ) const BOOST_USED; - virtual bool class_info() const { + ) const override BOOST_USED; + virtual bool class_info() const override { return boost::serialization::implementation_level< T >::value >= boost::serialization::object_class_info; } - virtual bool tracking(const unsigned int /* flags */) const { + virtual bool tracking(const unsigned int /* flags */) const override { return boost::serialization::tracking_level< T >::value == boost::serialization::track_always || ( boost::serialization::tracking_level< T >::value == boost::serialization::track_selectively && serialized_as_pointer()); } - virtual version_type version() const { + virtual version_type version() const override { return version_type(::boost::serialization::version< T >::value); } - virtual bool is_polymorphic() const { + virtual bool is_polymorphic() const override { return boost::is_polymorphic< T >::value; } - virtual ~iserializer(){}; + virtual ~iserializer() override{}; }; #ifdef BOOST_MSVC @@ -287,13 +287,13 @@ class pointer_iserializer : public basic_pointer_iserializer { private: - virtual void * heap_allocation() const { + virtual void * heap_allocation() const override { detail::heap_allocation h; T * t = h.get(); h.release(); return t; } - virtual const basic_iserializer & get_basic_serializer() const { + virtual const basic_iserializer & get_basic_serializer() const override { return boost::serialization::singleton< iserializer >::get_const_instance(); @@ -302,11 +302,11 @@ private: basic_iarchive & ar, void * x, const unsigned int file_version - ) const BOOST_USED; + ) const override BOOST_USED; protected: // this should alway be a singleton so make the constructor protected pointer_iserializer(); - ~pointer_iserializer(); + ~pointer_iserializer() override; }; #ifdef BOOST_MSVC diff --git a/bundled/boost-1.62.0/include/boost/archive/detail/oserializer.hpp b/bundled/boost-1.62.0/include/boost/archive/detail/oserializer.hpp index 0f2e733c58..57cbb4035b 100644 --- a/bundled/boost-1.62.0/include/boost/archive/detail/oserializer.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/detail/oserializer.hpp @@ -115,23 +115,23 @@ public: virtual BOOST_DLLEXPORT void save_object_data( basic_oarchive & ar, const void *x - ) const BOOST_USED; - virtual bool class_info() const { + ) const override BOOST_USED; + virtual bool class_info() const override { return boost::serialization::implementation_level< T >::value >= boost::serialization::object_class_info; } - virtual bool tracking(const unsigned int /* flags */) const { + virtual bool tracking(const unsigned int /* flags */) const override { return boost::serialization::tracking_level< T >::value == boost::serialization::track_always || (boost::serialization::tracking_level< T >::value == boost::serialization::track_selectively && serialized_as_pointer()); } - virtual version_type version() const { + virtual version_type version() const override { return version_type(::boost::serialization::version< T >::value); } - virtual bool is_polymorphic() const { + virtual bool is_polymorphic() const override { return boost::is_polymorphic< T >::value; } - virtual ~oserializer(){} + virtual ~oserializer() override{} }; #ifdef BOOST_MSVC @@ -164,7 +164,7 @@ class pointer_oserializer : { private: const basic_oserializer & - get_basic_serializer() const { + get_basic_serializer() const override { return boost::serialization::singleton< oserializer >::get_const_instance(); @@ -172,10 +172,10 @@ private: virtual BOOST_DLLEXPORT void save_object_ptr( basic_oarchive & ar, const void * x - ) const BOOST_USED; + ) const override BOOST_USED; public: pointer_oserializer(); - ~pointer_oserializer(); + ~pointer_oserializer() override; }; #ifdef BOOST_MSVC diff --git a/bundled/boost-1.62.0/include/boost/archive/iterators/dataflow_exception.hpp b/bundled/boost-1.62.0/include/boost/archive/iterators/dataflow_exception.hpp index e3e18605b3..1feed10059 100644 --- a/bundled/boost-1.62.0/include/boost/archive/iterators/dataflow_exception.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/iterators/dataflow_exception.hpp @@ -46,7 +46,7 @@ public: dataflow_exception(exception_code c = other_exception) : code(c) {} - virtual const char *what( ) const throw( ) + virtual const char *what( ) const throw( ) override { const char *msg = "unknown exception code"; switch(code){ diff --git a/bundled/boost-1.62.0/include/boost/archive/polymorphic_iarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/polymorphic_iarchive.hpp index d3c59a9f0f..ae63bd3d99 100644 --- a/bundled/boost-1.62.0/include/boost/archive/polymorphic_iarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/polymorphic_iarchive.hpp @@ -156,7 +156,7 @@ class BOOST_SYMBOL_VISIBLE polymorphic_iarchive : public polymorphic_iarchive_impl { public: - virtual ~polymorphic_iarchive(){}; + virtual ~polymorphic_iarchive() override{}; }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/polymorphic_oarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/polymorphic_oarchive.hpp index edac4edb1e..0ad35c78af 100644 --- a/bundled/boost-1.62.0/include/boost/archive/polymorphic_oarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/polymorphic_oarchive.hpp @@ -140,7 +140,7 @@ class BOOST_SYMBOL_VISIBLE polymorphic_oarchive : public polymorphic_oarchive_impl { public: - virtual ~polymorphic_oarchive(){}; + virtual ~polymorphic_oarchive() override{}; }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/text_iarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/text_iarchive.hpp index d9d60adf0b..2c75f2acfc 100644 --- a/bundled/boost-1.62.0/include/boost/archive/text_iarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/text_iarchive.hpp @@ -89,7 +89,7 @@ protected: text_iarchive_impl(std::istream & is, unsigned int flags); // don't import inline definitions! leave this as a reminder. //BOOST_ARCHIVE_DECL - ~text_iarchive_impl(){}; + ~text_iarchive_impl() override{}; }; } // namespace archive @@ -116,7 +116,7 @@ public: // note: added _ to suppress useless gcc warning text_iarchive_impl(is_, flags) {} - ~text_iarchive(){} + ~text_iarchive() override{} }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/text_oarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/text_oarchive.hpp index e4c6d4666a..9fd7993b89 100644 --- a/bundled/boost-1.62.0/include/boost/archive/text_oarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/text_oarchive.hpp @@ -86,7 +86,7 @@ protected: text_oarchive_impl(std::ostream & os, unsigned int flags); // don't import inline definitions! leave this as a reminder. //BOOST_ARCHIVE_DECL - ~text_oarchive_impl(){}; + ~text_oarchive_impl() override{}; public: BOOST_ARCHIVE_DECL void save_binary(const void *address, std::size_t count); @@ -103,7 +103,7 @@ public: // note: added _ to suppress useless gcc warning text_oarchive_impl(os_, flags) {} - ~text_oarchive(){} + ~text_oarchive() override{} }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/text_wiarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/text_wiarchive.hpp index 3adf068a51..2acc646702 100644 --- a/bundled/boost-1.62.0/include/boost/archive/text_wiarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/text_wiarchive.hpp @@ -94,7 +94,7 @@ protected: } BOOST_WARCHIVE_DECL text_wiarchive_impl(std::wistream & is, unsigned int flags); - ~text_wiarchive_impl(){}; + ~text_wiarchive_impl() override{}; }; } // namespace archive @@ -120,7 +120,7 @@ public: text_wiarchive(std::wistream & is, unsigned int flags = 0) : text_wiarchive_impl(is, flags) {} - ~text_wiarchive(){} + ~text_wiarchive() override{} }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/text_woarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/text_woarchive.hpp index beba62f705..b55d57e01f 100644 --- a/bundled/boost-1.62.0/include/boost/archive/text_woarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/text_woarchive.hpp @@ -136,7 +136,7 @@ public: text_woarchive(std::wostream & os, unsigned int flags = 0) : text_woarchive_impl(os, flags) {} - ~text_woarchive(){} + ~text_woarchive() override{} }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/xml_archive_exception.hpp b/bundled/boost-1.62.0/include/boost/archive/xml_archive_exception.hpp index 82c53ef5d3..5c21680af3 100644 --- a/bundled/boost-1.62.0/include/boost/archive/xml_archive_exception.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/xml_archive_exception.hpp @@ -46,7 +46,7 @@ public: const char * e2 = NULL ); BOOST_ARCHIVE_DECL xml_archive_exception(xml_archive_exception const &) ; - virtual BOOST_ARCHIVE_DECL ~xml_archive_exception() BOOST_NOEXCEPT_OR_NOTHROW ; + virtual BOOST_ARCHIVE_DECL ~xml_archive_exception() BOOST_NOEXCEPT_OR_NOTHROW override ; }; }// namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/xml_iarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/xml_iarchive.hpp index abd2f9fc4e..0fdda45b2a 100644 --- a/bundled/boost-1.62.0/include/boost/archive/xml_iarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/xml_iarchive.hpp @@ -101,7 +101,7 @@ protected: BOOST_ARCHIVE_DECL xml_iarchive_impl(std::istream & is, unsigned int flags); BOOST_ARCHIVE_DECL - ~xml_iarchive_impl(); + ~xml_iarchive_impl() override; }; } // namespace archive @@ -126,7 +126,7 @@ public: xml_iarchive(std::istream & is, unsigned int flags = 0) : xml_iarchive_impl(is, flags) {} - ~xml_iarchive(){}; + ~xml_iarchive() override{}; }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/xml_oarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/xml_oarchive.hpp index d0fa8b21f2..2222e627e8 100644 --- a/bundled/boost-1.62.0/include/boost/archive/xml_oarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/xml_oarchive.hpp @@ -86,7 +86,7 @@ protected: BOOST_ARCHIVE_DECL xml_oarchive_impl(std::ostream & os, unsigned int flags); BOOST_ARCHIVE_DECL - ~xml_oarchive_impl(); + ~xml_oarchive_impl() override; public: BOOST_ARCHIVE_DECL void save_binary(const void *address, std::size_t count); @@ -121,7 +121,7 @@ public: xml_oarchive(std::ostream & os, unsigned int flags = 0) : xml_oarchive_impl(os, flags) {} - ~xml_oarchive(){} + ~xml_oarchive() override{} }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/xml_wiarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/xml_wiarchive.hpp index ac24289ac1..e7c0393477 100644 --- a/bundled/boost-1.62.0/include/boost/archive/xml_wiarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/xml_wiarchive.hpp @@ -106,7 +106,7 @@ protected: BOOST_WARCHIVE_DECL xml_wiarchive_impl(std::wistream & is, unsigned int flags) ; BOOST_WARCHIVE_DECL - ~xml_wiarchive_impl(); + ~xml_wiarchive_impl() override; }; } // namespace archive @@ -132,7 +132,7 @@ public: xml_wiarchive(std::wistream & is, unsigned int flags = 0) : xml_wiarchive_impl(is, flags) {} - ~xml_wiarchive(){} + ~xml_wiarchive() override{} }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/archive/xml_woarchive.hpp b/bundled/boost-1.62.0/include/boost/archive/xml_woarchive.hpp index e6ac50de44..316e42469e 100644 --- a/bundled/boost-1.62.0/include/boost/archive/xml_woarchive.hpp +++ b/bundled/boost-1.62.0/include/boost/archive/xml_woarchive.hpp @@ -95,7 +95,7 @@ protected: BOOST_WARCHIVE_DECL xml_woarchive_impl(std::wostream & os, unsigned int flags); BOOST_WARCHIVE_DECL - ~xml_woarchive_impl(); + ~xml_woarchive_impl() override; public: BOOST_WARCHIVE_DECL void save_binary(const void *address, std::size_t count); @@ -115,7 +115,7 @@ public: xml_woarchive(std::wostream & os, unsigned int flags = 0) : xml_woarchive_impl(os, flags) {} - ~xml_woarchive(){} + ~xml_woarchive() override{} }; } // namespace archive diff --git a/bundled/boost-1.62.0/include/boost/detail/utf8_codecvt_facet.hpp b/bundled/boost-1.62.0/include/boost/detail/utf8_codecvt_facet.hpp index d2fa26d47a..2431f2cc38 100644 --- a/bundled/boost-1.62.0/include/boost/detail/utf8_codecvt_facet.hpp +++ b/bundled/boost-1.62.0/include/boost/detail/utf8_codecvt_facet.hpp @@ -114,7 +114,7 @@ struct BOOST_SYMBOL_VISIBLE utf8_codecvt_facet : { public: BOOST_UTF8_DECL explicit utf8_codecvt_facet(std::size_t no_locale_manage=0); - virtual ~utf8_codecvt_facet(){} + virtual ~utf8_codecvt_facet() override{} protected: BOOST_UTF8_DECL virtual std::codecvt_base::result do_in( std::mbstate_t& state, @@ -124,7 +124,7 @@ protected: wchar_t * to, wchar_t * to_end, wchar_t*& to_next - ) const; + ) const override; BOOST_UTF8_DECL virtual std::codecvt_base::result do_out( std::mbstate_t & state, @@ -134,7 +134,7 @@ protected: char * to, char * to_end, char * & to_next - ) const; + ) const override; bool invalid_continuing_octet(unsigned char octet_1) const { return (octet_1 < 0x80|| 0xbf< octet_1); @@ -156,7 +156,7 @@ protected: // == total octets - 1. BOOST_UTF8_DECL int get_cont_octet_out_count(wchar_t word) const ; - virtual bool do_always_noconv() const BOOST_NOEXCEPT_OR_NOTHROW { + virtual bool do_always_noconv() const BOOST_NOEXCEPT_OR_NOTHROW override { return false; } @@ -166,12 +166,12 @@ protected: char * from, char * /*to*/, char * & next - ) const { + ) const override { next = from; return ok; } - virtual int do_encoding() const BOOST_NOEXCEPT_OR_NOTHROW { + virtual int do_encoding() const BOOST_NOEXCEPT_OR_NOTHROW override { const int variable_byte_external_encoding=0; return variable_byte_external_encoding; } @@ -194,6 +194,7 @@ protected: const char * from_end, std::size_t max_limit ) const + override #if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) throw() #endif @@ -206,7 +207,7 @@ protected: ); } // Largest possible value do_length(state,from,from_end,1) could return. - virtual int do_max_length() const BOOST_NOEXCEPT_OR_NOTHROW { + virtual int do_max_length() const BOOST_NOEXCEPT_OR_NOTHROW override { return 6; // largest UTF-8 encoding of a UCS-4 character } }; diff --git a/bundled/boost-1.62.0/include/boost/format/exceptions.hpp b/bundled/boost-1.62.0/include/boost/format/exceptions.hpp index 56ee30dce0..29eea2eb21 100644 --- a/bundled/boost-1.62.0/include/boost/format/exceptions.hpp +++ b/bundled/boost-1.62.0/include/boost/format/exceptions.hpp @@ -30,7 +30,7 @@ namespace boost { { public: format_error() {} - virtual const char *what() const throw() { + virtual const char *what() const throw() override { return "boost::format_error: " "format generic failure"; } @@ -44,7 +44,7 @@ namespace boost { : pos_(pos), next_(size) {} std::size_t get_pos() const { return pos_; } std::size_t get_next() const { return next_; } - virtual const char *what() const throw() { + virtual const char *what() const throw() override { return "boost::bad_format_string: format-string is ill-formed"; } }; @@ -57,7 +57,7 @@ namespace boost { : cur_(cur), expected_(expected) {} std::size_t get_cur() const { return cur_; } std::size_t get_expected() const { return expected_; } - virtual const char *what() const throw() { + virtual const char *what() const throw() override { return "boost::too_few_args: " "format-string referred to more arguments than were passed"; } @@ -71,7 +71,7 @@ namespace boost { : cur_(cur), expected_(expected) {} std::size_t get_cur() const { return cur_; } std::size_t get_expected() const { return expected_; } - virtual const char *what() const throw() { + virtual const char *what() const throw() override { return "boost::too_many_args: " "format-string referred to fewer arguments than were passed"; } @@ -87,7 +87,7 @@ namespace boost { int get_index() const { return index_; } int get_beg() const { return beg_; } int get_end() const { return end_; } - virtual const char *what() const throw() { + virtual const char *what() const throw() override { return "boost::out_of_range: " "tried to refer to an argument (or item) number which" " is out of range, according to the format string"; diff --git a/bundled/boost-1.62.0/include/boost/iostreams/detail/streambuf/indirect_streambuf.hpp b/bundled/boost-1.62.0/include/boost/iostreams/detail/streambuf/indirect_streambuf.hpp index 8da5ef3c50..0855470fd6 100644 --- a/bundled/boost-1.62.0/include/boost/iostreams/detail/streambuf/indirect_streambuf.hpp +++ b/bundled/boost-1.62.0/include/boost/iostreams/detail/streambuf/indirect_streambuf.hpp @@ -66,9 +66,9 @@ public: void open(const T& t BOOST_IOSTREAMS_PUSH_PARAMS()); bool is_open() const; void close(); - bool auto_close() const; - void set_auto_close(bool close); - bool strict_sync(); + bool auto_close() const override; + void set_auto_close(bool close) override; + bool strict_sync() override; // Declared in linked_streambuf. T* component() { return &*obj(); } @@ -78,24 +78,24 @@ protected: //----------virtual functions---------------------------------------------// #ifndef BOOST_IOSTREAMS_NO_LOCALE - void imbue(const std::locale& loc); + void imbue(const std::locale& loc) override; #endif #ifdef BOOST_IOSTREAMS_NO_STREAM_TEMPLATES public: #endif - int_type underflow(); - int_type pbackfail(int_type c); - int_type overflow(int_type c); - int sync(); + int_type underflow() override; + int_type pbackfail(int_type c) override; + int_type overflow(int_type c) override; + int sync() override; pos_type seekoff( off_type off, BOOST_IOS::seekdir way, - BOOST_IOS::openmode which ); - pos_type seekpos(pos_type sp, BOOST_IOS::openmode which); + BOOST_IOS::openmode which ) override; + pos_type seekpos(pos_type sp, BOOST_IOS::openmode which) override; // Declared in linked_streambuf. - void set_next(streambuf_type* next); - void close_impl(BOOST_IOS::openmode m); - const std::type_info& component_type() const { return typeid(T); } - void* component_impl() { return component(); } + void set_next(streambuf_type* next) override; + void close_impl(BOOST_IOS::openmode m) override; + const std::type_info& component_type() const override { return typeid(T); } + void* component_impl() override { return component(); } private: //----------Accessor functions--------------------------------------------// diff --git a/bundled/boost-1.62.0/include/boost/iostreams/filtering_stream.hpp b/bundled/boost-1.62.0/include/boost/iostreams/filtering_stream.hpp index 3279c590cf..75f6a03224 100644 --- a/bundled/boost-1.62.0/include/boost/iostreams/filtering_stream.hpp +++ b/bundled/boost-1.62.0/include/boost/iostreams/filtering_stream.hpp @@ -89,7 +89,7 @@ protected: >::stream_type stream_type; filtering_stream_base() : stream_type(0) { this->set_chain(&chain_); } private: - void notify() { this->rdbuf(chain_.empty() ? 0 : &chain_.front()); } + void notify() override { this->rdbuf(chain_.empty() ? 0 : &chain_.front()); } Chain chain_; }; diff --git a/bundled/boost-1.62.0/include/boost/iostreams/stream_buffer.hpp b/bundled/boost-1.62.0/include/boost/iostreams/stream_buffer.hpp index dbcb786c65..61cd4ce635 100644 --- a/bundled/boost-1.62.0/include/boost/iostreams/stream_buffer.hpp +++ b/bundled/boost-1.62.0/include/boost/iostreams/stream_buffer.hpp @@ -84,7 +84,7 @@ public: BOOST_IOSTREAMS_STREAMBUF_TYPEDEFS(Tr) public: stream_buffer() { } - ~stream_buffer() + ~stream_buffer() override { try { if (this->is_open() && this->auto_close()) diff --git a/bundled/boost-1.62.0/include/boost/lexical_cast/bad_lexical_cast.hpp b/bundled/boost-1.62.0/include/boost/lexical_cast/bad_lexical_cast.hpp index 093121565e..39ba0f8b6d 100644 --- a/bundled/boost-1.62.0/include/boost/lexical_cast/bad_lexical_cast.hpp +++ b/bundled/boost-1.62.0/include/boost/lexical_cast/bad_lexical_cast.hpp @@ -51,12 +51,12 @@ namespace boost #endif {} - virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW { + virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW override { return "bad lexical cast: " "source type value could not be interpreted as target"; } - virtual ~bad_lexical_cast() BOOST_NOEXCEPT_OR_NOTHROW + virtual ~bad_lexical_cast() BOOST_NOEXCEPT_OR_NOTHROW override {} #ifndef BOOST_NO_TYPEID diff --git a/bundled/boost-1.62.0/include/boost/numeric/conversion/converter_policies.hpp b/bundled/boost-1.62.0/include/boost/numeric/conversion/converter_policies.hpp index e7a5e67ce9..85ed41aab9 100644 --- a/bundled/boost-1.62.0/include/boost/numeric/conversion/converter_policies.hpp +++ b/bundled/boost-1.62.0/include/boost/numeric/conversion/converter_policies.hpp @@ -136,7 +136,7 @@ class bad_numeric_cast : public std::bad_cast { public: - virtual const char * what() const throw() + virtual const char * what() const throw() override { return "bad numeric conversion: overflow"; } }; @@ -144,14 +144,14 @@ class negative_overflow : public bad_numeric_cast { public: - virtual const char * what() const throw() + virtual const char * what() const throw() override { return "bad numeric conversion: negative overflow"; } }; class positive_overflow : public bad_numeric_cast { public: - virtual const char * what() const throw() + virtual const char * what() const throw() override { return "bad numeric conversion: positive overflow"; } }; diff --git a/bundled/boost-1.62.0/include/boost/property_tree/detail/file_parser_error.hpp b/bundled/boost-1.62.0/include/boost/property_tree/detail/file_parser_error.hpp index ff90583f9e..7aeb0f6c4a 100644 --- a/bundled/boost-1.62.0/include/boost/property_tree/detail/file_parser_error.hpp +++ b/bundled/boost-1.62.0/include/boost/property_tree/detail/file_parser_error.hpp @@ -34,7 +34,7 @@ namespace boost { namespace property_tree { } - ~file_parser_error() throw() + ~file_parser_error() throw() override // gcc 3.4.2 complains about lack of throw specifier on compiler // generated dtor { diff --git a/bundled/boost-1.62.0/include/boost/property_tree/detail/rapidxml.hpp b/bundled/boost-1.62.0/include/boost/property_tree/detail/rapidxml.hpp index 9e3d76af9d..196807a70f 100644 --- a/bundled/boost-1.62.0/include/boost/property_tree/detail/rapidxml.hpp +++ b/bundled/boost-1.62.0/include/boost/property_tree/detail/rapidxml.hpp @@ -58,7 +58,7 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml //! Gets human readable description of error. //! \return Pointer to null terminated description of the error. - virtual const char *what() const throw() + virtual const char *what() const throw() override { return m_what; } diff --git a/bundled/boost-1.62.0/include/boost/property_tree/exceptions.hpp b/bundled/boost-1.62.0/include/boost/property_tree/exceptions.hpp index b35b27fce9..ca85966342 100644 --- a/bundled/boost-1.62.0/include/boost/property_tree/exceptions.hpp +++ b/bundled/boost-1.62.0/include/boost/property_tree/exceptions.hpp @@ -31,7 +31,7 @@ namespace boost { namespace property_tree /// @param what The message to associate with this error. ptree_error(const std::string &what); - ~ptree_error() throw(); + ~ptree_error() throw() override; }; @@ -48,7 +48,7 @@ namespace boost { namespace property_tree template ptree_bad_data(const std::string &what, const T &data); - ~ptree_bad_data() throw(); + ~ptree_bad_data() throw() override; /// Retrieve the data associated with this error. This is the source /// value that failed to be translated. You need to explicitly @@ -70,7 +70,7 @@ namespace boost { namespace property_tree template ptree_bad_path(const std::string &what, const T &path); - ~ptree_bad_path() throw(); + ~ptree_bad_path() throw() override; /// Retrieve the invalid path. You need to explicitly specify the /// type of path. diff --git a/bundled/boost-1.62.0/include/boost/serialization/extended_type_info_no_rtti.hpp b/bundled/boost-1.62.0/include/boost/serialization/extended_type_info_no_rtti.hpp index aaa8b44459..9a7991cdf3 100644 --- a/bundled/boost-1.62.0/include/boost/serialization/extended_type_info_no_rtti.hpp +++ b/bundled/boost-1.62.0/include/boost/serialization/extended_type_info_no_rtti.hpp @@ -57,12 +57,12 @@ class BOOST_SYMBOL_VISIBLE extended_type_info_no_rtti_0 : { protected: BOOST_SERIALIZATION_DECL extended_type_info_no_rtti_0(const char * key); - BOOST_SERIALIZATION_DECL ~extended_type_info_no_rtti_0(); + BOOST_SERIALIZATION_DECL ~extended_type_info_no_rtti_0() override; public: virtual BOOST_SERIALIZATION_DECL bool - is_less_than(const boost::serialization::extended_type_info &rhs) const ; + is_less_than(const boost::serialization::extended_type_info &rhs) const override ; virtual BOOST_SERIALIZATION_DECL bool - is_equal(const boost::serialization::extended_type_info &rhs) const ; + is_equal(const boost::serialization::extended_type_info &rhs) const override ; }; } // no_rtti_system @@ -103,7 +103,7 @@ public: { key_register(); } - ~extended_type_info_no_rtti(){ + ~extended_type_info_no_rtti() override{ key_unregister(); } const extended_type_info * @@ -121,10 +121,10 @@ public: const char * get_key() const{ return action::value >::invoke(); } - virtual const char * get_debug_info() const{ + virtual const char * get_debug_info() const override{ return action::value >::invoke(); } - virtual void * construct(unsigned int count, ...) const{ + virtual void * construct(unsigned int count, ...) const override{ // count up the arguments std::va_list ap; va_start(ap, count); @@ -145,7 +145,7 @@ public: return NULL; } } - virtual void destroy(void const * const p) const{ + virtual void destroy(void const * const p) const override{ boost::serialization::access::destroy( static_cast(p) ); diff --git a/bundled/boost-1.62.0/include/boost/serialization/extended_type_info_typeid.hpp b/bundled/boost-1.62.0/include/boost/serialization/extended_type_info_typeid.hpp index 8ee591b316..a9def03825 100644 --- a/bundled/boost-1.62.0/include/boost/serialization/extended_type_info_typeid.hpp +++ b/bundled/boost-1.62.0/include/boost/serialization/extended_type_info_typeid.hpp @@ -52,7 +52,7 @@ namespace typeid_system { class BOOST_SYMBOL_VISIBLE extended_type_info_typeid_0 : public extended_type_info { - virtual const char * get_debug_info() const { + virtual const char * get_debug_info() const override { if(static_cast(0) == m_ti) return static_cast(0); return m_ti->name(); @@ -60,16 +60,16 @@ class BOOST_SYMBOL_VISIBLE extended_type_info_typeid_0 : protected: const std::type_info * m_ti; BOOST_SERIALIZATION_DECL extended_type_info_typeid_0(const char * key); - BOOST_SERIALIZATION_DECL ~extended_type_info_typeid_0(); + BOOST_SERIALIZATION_DECL ~extended_type_info_typeid_0() override; BOOST_SERIALIZATION_DECL void type_register(const std::type_info & ti); BOOST_SERIALIZATION_DECL void type_unregister(); BOOST_SERIALIZATION_DECL const extended_type_info * get_extended_type_info(const std::type_info & ti) const; public: virtual BOOST_SERIALIZATION_DECL bool - is_less_than(const extended_type_info &rhs) const; + is_less_than(const extended_type_info &rhs) const override; virtual BOOST_SERIALIZATION_DECL bool - is_equal(const extended_type_info &rhs) const; + is_equal(const extended_type_info &rhs) const override; const std::type_info & get_typeid() const { return *m_ti; } @@ -91,7 +91,7 @@ public: type_register(typeid(T)); key_register(); } - ~extended_type_info_typeid(){ + ~extended_type_info_typeid() override{ key_unregister(); type_unregister(); } @@ -110,7 +110,7 @@ public: const char * get_key() const { return boost::serialization::guid< T >(); } - virtual void * construct(unsigned int count, ...) const{ + virtual void * construct(unsigned int count, ...) const override{ // count up the arguments std::va_list ap; va_start(ap, count); @@ -131,7 +131,7 @@ public: return NULL; } } - virtual void destroy(void const * const p) const { + virtual void destroy(void const * const p) const override { boost::serialization::access::destroy( static_cast(p) ); diff --git a/bundled/boost-1.62.0/include/boost/serialization/singleton.hpp b/bundled/boost-1.62.0/include/boost/serialization/singleton.hpp index fcb79c3694..25dfef8059 100644 --- a/bundled/boost-1.62.0/include/boost/serialization/singleton.hpp +++ b/bundled/boost-1.62.0/include/boost/serialization/singleton.hpp @@ -101,7 +101,7 @@ class singleton_wrapper : public T { public: static bool m_is_destroyed; - ~singleton_wrapper(){ + ~singleton_wrapper() { m_is_destroyed = true; } }; diff --git a/bundled/boost-1.62.0/include/boost/serialization/void_cast.hpp b/bundled/boost-1.62.0/include/boost/serialization/void_cast.hpp index f1b3828611..5956dca377 100644 --- a/bundled/boost-1.62.0/include/boost/serialization/void_cast.hpp +++ b/bundled/boost-1.62.0/include/boost/serialization/void_cast.hpp @@ -154,26 +154,26 @@ template class BOOST_SYMBOL_VISIBLE void_caster_primitive : public void_caster { - virtual void const * downcast(void const * const t) const { + virtual void const * downcast(void const * const t) const override { const Derived * d = boost::serialization::smart_cast( static_cast(t) ); return d; } - virtual void const * upcast(void const * const t) const { + virtual void const * upcast(void const * const t) const override { const Base * b = boost::serialization::smart_cast( static_cast(t) ); return b; } - virtual bool has_virtual_base() const { + virtual bool has_virtual_base() const override { return false; } public: void_caster_primitive(); - virtual ~void_caster_primitive(); + virtual ~void_caster_primitive() override; }; template @@ -202,18 +202,18 @@ template class BOOST_SYMBOL_VISIBLE void_caster_virtual_base : public void_caster { - virtual bool has_virtual_base() const { + virtual bool has_virtual_base() const override { return true; } public: - virtual void const * downcast(void const * const t) const { + virtual void const * downcast(void const * const t) const override { const Derived * d = dynamic_cast( static_cast(t) ); return d; } - virtual void const * upcast(void const * const t) const { + virtual void const * upcast(void const * const t) const override { const Base * b = dynamic_cast( static_cast(t) @@ -221,7 +221,7 @@ public: return b; } void_caster_virtual_base(); - virtual ~void_caster_virtual_base(); + virtual ~void_caster_virtual_base() override; }; #ifdef BOOST_MSVC diff --git a/bundled/boost-1.62.0/include/boost/signals2/connection.hpp b/bundled/boost-1.62.0/include/boost/signals2/connection.hpp index dac806b221..ac980ef0e0 100644 --- a/bundled/boost-1.62.0/include/boost/signals2/connection.hpp +++ b/bundled/boost-1.62.0/include/boost/signals2/connection.hpp @@ -145,8 +145,8 @@ namespace boost m_slot(new SlotType(slot_in)), _mutex(signal_mutex) { } - virtual ~connection_body() {} - virtual bool connected() const + virtual ~connection_body() override {} + virtual bool connected() const override { garbage_collecting_lock local_lock(*_mutex); nolock_grab_tracked_objects(local_lock, detail::null_output_iterator()); @@ -191,11 +191,11 @@ namespace boost } } // expose Lockable concept of mutex - virtual void lock() + virtual void lock() override { _mutex->lock(); } - virtual void unlock() + virtual void unlock() override { _mutex->unlock(); } @@ -208,7 +208,7 @@ namespace boost return *m_slot; } protected: - virtual shared_ptr release_slot() const + virtual shared_ptr release_slot() const override { shared_ptr released_slot = m_slot; diff --git a/bundled/boost-1.62.0/include/boost/signals2/detail/foreign_ptr.hpp b/bundled/boost-1.62.0/include/boost/signals2/detail/foreign_ptr.hpp index a28ba4337c..80f5a5b482 100644 --- a/bundled/boost-1.62.0/include/boost/signals2/detail/foreign_ptr.hpp +++ b/bundled/boost-1.62.0/include/boost/signals2/detail/foreign_ptr.hpp @@ -70,7 +70,7 @@ namespace boost public: foreign_shared_ptr_impl(const FSP &p): _p(p) {} - virtual foreign_shared_ptr_impl * clone() const + virtual foreign_shared_ptr_impl * clone() const override { return new foreign_shared_ptr_impl(*this); } @@ -123,15 +123,15 @@ namespace boost public: foreign_weak_ptr_impl(const FWP &p): _p(p) {} - virtual foreign_void_shared_ptr lock() const + virtual foreign_void_shared_ptr lock() const override { return foreign_void_shared_ptr(_p.lock()); } - virtual bool expired() const + virtual bool expired() const override { return _p.expired(); } - virtual foreign_weak_ptr_impl * clone() const + virtual foreign_weak_ptr_impl * clone() const override { return new foreign_weak_ptr_impl(*this); } diff --git a/bundled/boost-1.62.0/include/boost/signals2/detail/signal_template.hpp b/bundled/boost-1.62.0/include/boost/signals2/detail/signal_template.hpp index 036876727a..fb7591bbc1 100644 --- a/bundled/boost-1.62.0/include/boost/signals2/detail/signal_template.hpp +++ b/bundled/boost-1.62.0/include/boost/signals2/detail/signal_template.hpp @@ -660,7 +660,7 @@ namespace boost const group_compare_type &group_compare = group_compare_type()): _pimpl(new impl_class(combiner_arg, group_compare)) {}; - virtual ~BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)() + virtual ~BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)() override { } @@ -748,7 +748,7 @@ namespace boost swap(_pimpl, other._pimpl); } protected: - virtual shared_ptr lock_pimpl() const + virtual shared_ptr lock_pimpl() const override { return _pimpl; } diff --git a/bundled/boost-1.62.0/include/boost/signals2/expired_slot.hpp b/bundled/boost-1.62.0/include/boost/signals2/expired_slot.hpp index fa6db22d66..d04996e2e0 100644 --- a/bundled/boost-1.62.0/include/boost/signals2/expired_slot.hpp +++ b/bundled/boost-1.62.0/include/boost/signals2/expired_slot.hpp @@ -20,7 +20,7 @@ namespace boost class expired_slot: public bad_weak_ptr { public: - virtual char const * what() const throw() + virtual char const * what() const throw() override { return "boost::signals2::expired_slot"; } diff --git a/bundled/boost-1.62.0/include/boost/signals2/last_value.hpp b/bundled/boost-1.62.0/include/boost/signals2/last_value.hpp index 99fb6afbc3..ead41e3e6c 100644 --- a/bundled/boost-1.62.0/include/boost/signals2/last_value.hpp +++ b/bundled/boost-1.62.0/include/boost/signals2/last_value.hpp @@ -25,7 +25,7 @@ namespace boost { class no_slots_error: public std::exception { public: - virtual const char* what() const throw() {return "boost::signals2::no_slots_error";} + virtual const char* what() const throw() override {return "boost::signals2::no_slots_error";} }; template diff --git a/bundled/boost-1.62.0/include/boost/smart_ptr/bad_weak_ptr.hpp b/bundled/boost-1.62.0/include/boost/smart_ptr/bad_weak_ptr.hpp index 3e0a1b7286..cc259787a7 100644 --- a/bundled/boost-1.62.0/include/boost/smart_ptr/bad_weak_ptr.hpp +++ b/bundled/boost-1.62.0/include/boost/smart_ptr/bad_weak_ptr.hpp @@ -40,7 +40,7 @@ class bad_weak_ptr: public std::exception { public: - virtual char const * what() const throw() + virtual char const * what() const throw() override { return "tr1::bad_weak_ptr"; } diff --git a/bundled/boost-1.62.0/include/boost/smart_ptr/detail/array_count_impl.hpp b/bundled/boost-1.62.0/include/boost/smart_ptr/detail/array_count_impl.hpp index b7c9617f0b..48ad7b4dad 100644 --- a/bundled/boost-1.62.0/include/boost/smart_ptr/detail/array_count_impl.hpp +++ b/bundled/boost-1.62.0/include/boost/smart_ptr/detail/array_count_impl.hpp @@ -24,11 +24,11 @@ namespace boost { : allocator(allocator_) { } - virtual void dispose() { + virtual void dispose() override { allocator(); } - virtual void destroy() { + virtual void destroy() override { #if !defined(BOOST_NO_CXX11_ALLOCATOR) typedef typename std::allocator_traits:: template rebind_alloc YA; @@ -47,11 +47,11 @@ namespace boost { #endif } - virtual void* get_deleter(const sp_typeinfo&) { + virtual void* get_deleter(const sp_typeinfo&) override { return &reinterpret_cast(allocator); } - virtual void* get_untyped_deleter() { + virtual void* get_untyped_deleter() override { return &reinterpret_cast(allocator); } diff --git a/bundled/boost-1.62.0/include/boost/smart_ptr/detail/sp_counted_impl.hpp b/bundled/boost-1.62.0/include/boost/smart_ptr/detail/sp_counted_impl.hpp index 1222f3c9f4..5c6f335712 100644 --- a/bundled/boost-1.62.0/include/boost/smart_ptr/detail/sp_counted_impl.hpp +++ b/bundled/boost-1.62.0/include/boost/smart_ptr/detail/sp_counted_impl.hpp @@ -70,7 +70,7 @@ public: #endif } - virtual void dispose() // nothrow + virtual void dispose() override // nothrow { #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS) boost::sp_scalar_destructor_hook( px_, sizeof(X), this ); @@ -78,12 +78,12 @@ public: boost::checked_delete( px_ ); } - virtual void * get_deleter( sp_typeinfo const & ) + virtual void * get_deleter( sp_typeinfo const & ) override { return 0; } - virtual void * get_untyped_deleter() + virtual void * get_untyped_deleter() override { return 0; } @@ -148,17 +148,17 @@ public: { } - virtual void dispose() // nothrow + virtual void dispose() override // nothrow { del( ptr ); } - virtual void * get_deleter( sp_typeinfo const & ti ) + virtual void * get_deleter( sp_typeinfo const & ti ) override { return ti == BOOST_SP_TYPEID(D)? &reinterpret_cast( del ): 0; } - virtual void * get_untyped_deleter() + virtual void * get_untyped_deleter() override { return &reinterpret_cast( del ); } @@ -217,12 +217,12 @@ public: { } - virtual void dispose() // nothrow + virtual void dispose() override // nothrow { d_( p_ ); } - virtual void destroy() // nothrow + virtual void destroy() override // nothrow { #if !defined( BOOST_NO_CXX11_ALLOCATOR ) @@ -249,12 +249,12 @@ public: a2.deallocate( this, 1 ); } - virtual void * get_deleter( sp_typeinfo const & ti ) + virtual void * get_deleter( sp_typeinfo const & ti ) override { return ti == BOOST_SP_TYPEID( D )? &reinterpret_cast( d_ ): 0; } - virtual void * get_untyped_deleter() + virtual void * get_untyped_deleter() override { return &reinterpret_cast( d_ ); } diff --git a/bundled/boost-1.62.0/include/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp b/bundled/boost-1.62.0/include/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp index 137694ef2f..2d53f5f899 100644 --- a/bundled/boost-1.62.0/include/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp +++ b/bundled/boost-1.62.0/include/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp @@ -233,16 +233,16 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN struct concrete_parser : abstract_parser { concrete_parser(ParserT const& p_) : p(p_) {} - virtual ~concrete_parser() {} + virtual ~concrete_parser() override {} virtual typename match_result::type - do_parse_virtual(ScannerT const& scan) const + do_parse_virtual(ScannerT const& scan) const override { return p.parse(scan); } virtual abstract_parser* - clone() const + clone() const override { return new concrete_parser(p); } diff --git a/bundled/boost-1.62.0/include/boost/system/detail/error_code.ipp b/bundled/boost-1.62.0/include/boost/system/detail/error_code.ipp index 71c60f61da..e1e3276d6c 100644 --- a/bundled/boost-1.62.0/include/boost/system/detail/error_code.ipp +++ b/bundled/boost-1.62.0/include/boost/system/detail/error_code.ipp @@ -45,17 +45,17 @@ namespace { public: generic_error_category(){} - const char * name() const BOOST_SYSTEM_NOEXCEPT; - std::string message( int ev ) const; + const char * name() const BOOST_SYSTEM_NOEXCEPT override; + std::string message( int ev ) const override; }; class system_error_category : public error_category { public: system_error_category(){} - const char * name() const BOOST_SYSTEM_NOEXCEPT; - std::string message( int ev ) const; - error_condition default_error_condition( int ev ) const BOOST_SYSTEM_NOEXCEPT; + const char * name() const BOOST_SYSTEM_NOEXCEPT override; + std::string message( int ev ) const override; + error_condition default_error_condition( int ev ) const BOOST_SYSTEM_NOEXCEPT override; }; // generic_error_category implementation ---------------------------------// diff --git a/bundled/boost-1.62.0/include/boost/variant/bad_visit.hpp b/bundled/boost-1.62.0/include/boost/variant/bad_visit.hpp index e07657eab5..f02f62ae18 100644 --- a/bundled/boost-1.62.0/include/boost/variant/bad_visit.hpp +++ b/bundled/boost-1.62.0/include/boost/variant/bad_visit.hpp @@ -28,7 +28,7 @@ struct bad_visit { public: // std::exception interface - virtual const char * what() const BOOST_NOEXCEPT_OR_NOTHROW + virtual const char * what() const BOOST_NOEXCEPT_OR_NOTHROW override { return "boost::bad_visit: " "failed visitation using boost::apply_visitor"; diff --git a/bundled/boost-1.62.0/include/boost/variant/get.hpp b/bundled/boost-1.62.0/include/boost/variant/get.hpp index f3eb84dc29..07f1735938 100644 --- a/bundled/boost-1.62.0/include/boost/variant/get.hpp +++ b/bundled/boost-1.62.0/include/boost/variant/get.hpp @@ -42,7 +42,7 @@ class BOOST_SYMBOL_VISIBLE bad_get { public: // std::exception implementation - virtual const char * what() const BOOST_NOEXCEPT_OR_NOTHROW + virtual const char * what() const BOOST_NOEXCEPT_OR_NOTHROW override { return "boost::bad_get: " "failed value get using boost::get"; diff --git a/bundled/boost-1.62.0/libs/serialization/src/basic_oarchive.cpp b/bundled/boost-1.62.0/libs/serialization/src/basic_oarchive.cpp index 538be310a0..9e7cfe1662 100644 --- a/bundled/boost-1.62.0/libs/serialization/src/basic_oarchive.cpp +++ b/bundled/boost-1.62.0/libs/serialization/src/basic_oarchive.cpp @@ -178,28 +178,28 @@ basic_oarchive_impl::find(const serialization::extended_type_info & ti) const { class bosarg : public basic_oserializer { - bool class_info() const { + bool class_info() const override { BOOST_ASSERT(false); return false; } // returns true if objects should be tracked - bool tracking(const unsigned int) const { + bool tracking(const unsigned int) const override { BOOST_ASSERT(false); return false; } // returns class version - version_type version() const { + version_type version() const override { BOOST_ASSERT(false); return version_type(0); } // returns true if this class is polymorphic - bool is_polymorphic() const{ + bool is_polymorphic() const override{ BOOST_ASSERT(false); return false; } void save_object_data( basic_oarchive & /*ar*/, const void * /*x*/ - ) const { + ) const override { BOOST_ASSERT(false); } public: diff --git a/bundled/boost-1.62.0/libs/serialization/src/extended_type_info.cpp b/bundled/boost-1.62.0/libs/serialization/src/extended_type_info.cpp index 13a60c3e77..db7a22d66b 100644 --- a/bundled/boost-1.62.0/libs/serialization/src/extended_type_info.cpp +++ b/bundled/boost-1.62.0/libs/serialization/src/extended_type_info.cpp @@ -80,23 +80,23 @@ typedef std::multiset ktmap; class extended_type_info_arg : public extended_type_info { virtual bool - is_less_than(const extended_type_info & /*rhs*/) const { + is_less_than(const extended_type_info & /*rhs*/) const override { BOOST_ASSERT(false); return false; }; virtual bool - is_equal(const extended_type_info & /*rhs*/) const { + is_equal(const extended_type_info & /*rhs*/) const override { BOOST_ASSERT(false); return false; }; - virtual const char * get_debug_info() const { + virtual const char * get_debug_info() const override { return get_key(); } - virtual void * construct(unsigned int /*count*/, ...) const{ + virtual void * construct(unsigned int /*count*/, ...) const override{ BOOST_ASSERT(false); return NULL; } - virtual void destroy(void const * const /*p*/) const { + virtual void destroy(void const * const /*p*/) const override { BOOST_ASSERT(false); } public: @@ -104,7 +104,7 @@ public: extended_type_info(0, key) {} - ~extended_type_info_arg(){ + ~extended_type_info_arg() override{ } }; diff --git a/bundled/boost-1.62.0/libs/serialization/src/extended_type_info_typeid.cpp b/bundled/boost-1.62.0/libs/serialization/src/extended_type_info_typeid.cpp index 5669dfa772..495e6c3680 100644 --- a/bundled/boost-1.62.0/libs/serialization/src/extended_type_info_typeid.cpp +++ b/bundled/boost-1.62.0/libs/serialization/src/extended_type_info_typeid.cpp @@ -122,11 +122,11 @@ extended_type_info_typeid_0::type_unregister() class extended_type_info_typeid_arg : public extended_type_info_typeid_0 { - virtual void * construct(unsigned int /*count*/, ...) const{ + virtual void * construct(unsigned int /*count*/, ...) const override{ BOOST_ASSERT(false); return NULL; } - virtual void destroy(void const * const /*p*/) const { + virtual void destroy(void const * const /*p*/) const override { BOOST_ASSERT(false); } public: @@ -138,7 +138,7 @@ public: // be added to the map. m_ti = & ti; } - ~extended_type_info_typeid_arg(){ + ~extended_type_info_typeid_arg() override{ m_ti = NULL; } }; diff --git a/bundled/boost-1.62.0/libs/serialization/src/void_cast.cpp b/bundled/boost-1.62.0/libs/serialization/src/void_cast.cpp index 9009993326..a28d9f18c2 100644 --- a/bundled/boost-1.62.0/libs/serialization/src/void_cast.cpp +++ b/bundled/boost-1.62.0/libs/serialization/src/void_cast.cpp @@ -88,13 +88,13 @@ class void_caster_shortcut : public void_caster void const * const t ) const; virtual void const * - upcast(void const * const t) const{ + upcast(void const * const t) const override{ if(m_includes_virtual_base) return vbc_upcast(t); return static_cast ( t ) - m_difference; } virtual void const * - downcast(void const * const t) const{ + downcast(void const * const t) const override{ if(m_includes_virtual_base) return vbc_downcast(t); return static_cast ( t ) + m_difference; @@ -102,7 +102,7 @@ class void_caster_shortcut : public void_caster virtual bool is_shortcut() const { return true; } - virtual bool has_virtual_base() const { + virtual bool has_virtual_base() const override { return m_includes_virtual_base; } public: @@ -118,7 +118,7 @@ public: { recursive_register(includes_virtual_base); } - virtual ~void_caster_shortcut(){ + virtual ~void_caster_shortcut() override{ recursive_unregister(); } }; @@ -188,16 +188,16 @@ void_caster_shortcut::vbc_upcast( class void_caster_argument : public void_caster { virtual void const * - upcast(void const * const /*t*/) const { + upcast(void const * const /*t*/) const override { BOOST_ASSERT(false); return NULL; } virtual void const * - downcast( void const * const /*t*/) const { + downcast( void const * const /*t*/) const override { BOOST_ASSERT(false); return NULL; } - virtual bool has_virtual_base() const { + virtual bool has_virtual_base() const override { BOOST_ASSERT(false); return false; } @@ -208,7 +208,7 @@ public: ) : void_caster(derived, base) {} - virtual ~void_caster_argument(){}; + virtual ~void_caster_argument() override{}; }; #ifdef BOOST_MSVC -- 2.39.5