From 1741c826642ccd2204b2fece7452c2c0e462474a Mon Sep 17 00:00:00 2001 From: wl Date: Wed, 15 Dec 2010 20:44:39 +0000 Subject: Fix compilation problem. This issue happens with gcc 4.2.4. * src/roff/troff/node.cpp (node::~node): Move to... * src/roff/troff/node.h: Here. This ensures that the inline member function is publicly visible. --- ChangeLog | 10 ++++++++++ src/roff/troff/node.cpp | 8 -------- src/roff/troff/node.h | 8 ++++++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9e473b4..790dafb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-12-15 Werner LEMBERG + + Fix compilation problem. + + This issue happens with gcc 4.2.4. + + * src/roff/troff/node.cpp (node::~node): Move to... + * src/roff/troff/node.h: Here. This ensures that the inline + member function is publicly visible. + 2010-12-15 Werner LEMBERG Remove unused code. diff --git a/src/roff/troff/node.cpp b/src/roff/troff/node.cpp index 0f22857f..9a964a0d 100644 --- a/src/roff/troff/node.cpp +++ b/src/roff/troff/node.cpp @@ -1811,14 +1811,6 @@ void suppress_output_file::really_transparent_char(unsigned char) { } -inline node::~node() -{ - if (state != 0) - delete state; - if (push_state != 0) - delete push_state; -} - /* glyphs, ligatures, kerns, discretionary breaks */ class charinfo_node : public node { diff --git a/src/roff/troff/node.h b/src/roff/troff/node.h index 641f5c81..615cc930 100644 --- a/src/roff/troff/node.h +++ b/src/roff/troff/node.h @@ -132,6 +132,14 @@ inline node::node(node *n, statem *s, int divlevel) state = 0; } +inline node::~node() +{ + if (state != 0) + delete state; + if (push_state != 0) + delete push_state; +} + // 0 means it doesn't, 1 means it does, 2 means it's transparent int node_list_ends_sentence(node *); -- cgit v1.2.1