[Groff-commit] groff src/roff/troff/node.cpp src/roff/troff/no...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     10/12/15 20:44:40

Modified files:
        src/roff/troff : node.cpp node.h 
        .              : ChangeLog 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/node.cpp?cvsroot=groff&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/node.h?cvsroot=groff&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1256&r2=1.1257

Patches:
Index: src/roff/troff/node.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/node.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/roff/troff/node.cpp     15 Dec 2010 05:57:38 -0000      1.35
+++ src/roff/troff/node.cpp     15 Dec 2010 20:44:39 -0000      1.36
@@ -1811,14 +1811,6 @@
 {
 }
 
-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 {

Index: src/roff/troff/node.h
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/node.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/roff/troff/node.h       15 Dec 2010 05:57:38 -0000      1.35
+++ src/roff/troff/node.h       15 Dec 2010 20:44:39 -0000      1.36
@@ -132,6 +132,14 @@
     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 *);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1256
retrieving revision 1.1257
diff -u -b -r1.1256 -r1.1257
--- ChangeLog   15 Dec 2010 05:57:38 -0000      1.1256
+++ ChangeLog   15 Dec 2010 20:44:39 -0000      1.1257
@@ -1,5 +1,15 @@
 2010-12-15  Werner LEMBERG  <address@hidden>
 
+       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  <address@hidden>
+
        Remove unused code.
 
        * src/roff/troff/node.cpp, src/roff/troff/node.h