tests/istream_ioparser/main.cc: Replace final by override

kjellahl · kjellahl · commit 44ae82b731a2 · 2022-07-05T17:26:28.000+02:00
gcc 8 does not understand that final implies override.
diff --git a/tests/istream_ioparser/main.cc b/tests/istream_ioparser/main.cc
@@ -36,30 +36,30 @@ class test_streambuf : public std::streambuf
 
 protected:
   /* Simulate some kind of streambuf impl that doesn't setg() */
-  int_type underflow() final
+  int_type underflow() override
   {
     ++underflow_calls;
     if (ofs >= (sizeof(buf)-1))
       return traits_type::eof();
     return traits_type::to_int_type(buf[ofs]);
   }
 
-  int_type uflow() final
+  int_type uflow() override
   {
     ++uflow_calls;
     if (ofs >= (sizeof(buf)-1))
       return traits_type::eof();
     return traits_type::to_int_type(buf[ofs++]);
   }
 
-  std::streamsize showmanyc() final
+  std::streamsize showmanyc() override
   {
     if (ofs >= (sizeof(buf)-1))
       return traits_type::eof();
     return sizeof(buf)-1-ofs;
   }
 
-  std::streamsize xsgetn(char_type* s, std::streamsize count) final
+  std::streamsize xsgetn(char_type* s, std::streamsize count) override
   {
     auto n = std::min(count, static_cast<std::streamsize>(sizeof(buf)-1-ofs));
     memcpy(s, buf + ofs, n);
@@ -80,11 +80,11 @@ class MySaxParser : public xmlpp::SaxParser {
 public:
   bool saw_root = false;
 protected:
-  void on_start_document() final
+  void on_start_document() override
   {
       saw_root = false;
   }
-  void on_end_element(const xmlpp::ustring &name) final
+  void on_end_element(const xmlpp::ustring &name) override
   {
     if (name == "root")
       saw_root = true;

Original file line number	Diff line number	Diff line change
`@@ -36,30 +36,30 @@ class test_streambuf : public std::streambuf`
`36`	`36`
`37`	`37`	`protected:`
`38`	`38`	`/* Simulate some kind of streambuf impl that doesn't setg() */`
`39`		`- int_type underflow() final`
	`39`	`+ int_type underflow() override`
`40`	`40`	`{`
`41`	`41`	`++underflow_calls;`
`42`	`42`	`if (ofs >= (sizeof(buf)-1))`
`43`	`43`	`return traits_type::eof();`
`44`	`44`	`return traits_type::to_int_type(buf[ofs]);`
`45`	`45`	`}`
`46`	`46`
`47`		`- int_type uflow() final`
	`47`	`+ int_type uflow() override`
`48`	`48`	`{`
`49`	`49`	`++uflow_calls;`
`50`	`50`	`if (ofs >= (sizeof(buf)-1))`
`51`	`51`	`return traits_type::eof();`
`52`	`52`	`return traits_type::to_int_type(buf[ofs++]);`
`53`	`53`	`}`
`54`	`54`
`55`		`- std::streamsize showmanyc() final`
	`55`	`+ std::streamsize showmanyc() override`
`56`	`56`	`{`
`57`	`57`	`if (ofs >= (sizeof(buf)-1))`
`58`	`58`	`return traits_type::eof();`
`59`	`59`	`return sizeof(buf)-1-ofs;`
`60`	`60`	`}`
`61`	`61`
`62`		`- std::streamsize xsgetn(char_type* s, std::streamsize count) final`
	`62`	`+ std::streamsize xsgetn(char_type* s, std::streamsize count) override`
`63`	`63`	`{`
`64`	`64`	`auto n = std::min(count, static_cast<std::streamsize>(sizeof(buf)-1-ofs));`
`65`	`65`	`memcpy(s, buf + ofs, n);`
`@@ -80,11 +80,11 @@ class MySaxParser : public xmlpp::SaxParser {`
`80`	`80`	`public:`
`81`	`81`	`bool saw_root = false;`
`82`	`82`	`protected:`
`83`		`- void on_start_document() final`
	`83`	`+ void on_start_document() override`
`84`	`84`	`{`
`85`	`85`	`saw_root = false;`
`86`	`86`	`}`
`87`		`- void on_end_element(const xmlpp::ustring &name) final`
	`87`	`+ void on_end_element(const xmlpp::ustring &name) override`
`88`	`88`	`{`
`89`	`89`	`if (name == "root")`
`90`	`90`	`saw_root = true;`