Skip to content

Commit 480e92f

Browse files
author
Kjell Ahlstedt
committed
Document: Make some methods non-virtual
* libxml++/document.h: Make some private methods non-virtual. Bug #754673.
1 parent 30e996f commit 480e92f

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

libxml++/document.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ class Document : NonCopyable
5353
{
5454
public:
5555
Init();
56-
57-
//TODO: Remove the virtual when we can break ABI?
58-
virtual ~Init();
56+
~Init();
5957
};
6058

6159
friend class SaxParser;
@@ -253,11 +251,9 @@ class Document : NonCopyable
253251
_xmlEntity* get_entity(const Glib::ustring& name);
254252

255253
private:
256-
//TODO: Remove virtuals when we can break ABI.
257-
258-
virtual void do_write_to_file(const Glib::ustring& filename, const Glib::ustring& encoding, bool format);
259-
virtual Glib::ustring do_write_to_string(const Glib::ustring& encoding, bool format);
260-
virtual void do_write_to_stream(std::ostream& output, const Glib::ustring& encoding, bool format);
254+
void do_write_to_file(const Glib::ustring& filename, const Glib::ustring& encoding, bool format);
255+
Glib::ustring do_write_to_string(const Glib::ustring& encoding, bool format);
256+
void do_write_to_stream(std::ostream& output, const Glib::ustring& encoding, bool format);
261257

262258
static Init init_;
263259

0 commit comments

Comments
 (0)