Mercurial > hg > octave-max

changeset 12414:1cf28ef2bb88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small changes for GCC 4.6
author John W. Eaton <jwe@octave.org>
date Tue, 08 Feb 2011 15:59:37 -0500
parents b7d0d6044bd7
children b914e8125f1b
files liboctave/ChangeLog liboctave/oct-alloc.h src/ChangeLog src/pr-output.cc
diffstat 4 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-08  John W. Eaton  <jwe@octave.org>
+
+	* oct-alloc.h: Include <cstddef>.
+	From Orion Poplawski <orion@cora.nwra.com>.
+
 2011-02-06  John W. Eaton  <jwe@octave.org>
 
 	* PermMatrix.cc (operator*): Fix mixed row/column permutation
--- a/liboctave/oct-alloc.h
+++ b/liboctave/oct-alloc.h
@@ -23,6 +23,8 @@
 #if !defined (octave_oct_alloc_h)
 #define octave_oct_alloc_h 1
 
+#include <cstddef>
+
 class
 OCTAVE_API
 octave_allocator
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-08  John W. Eaton  <jwe@octave.org>
+
+	* pr-output.cc (INSTANTIATE_ABS): Omit inline keyword from
+	template instantiation.  From Orion Poplawski <orion@cora.nwra.com>.
+
 2011-02-08  John W. Eaton  <jwe@octave.org>
 
 	* DLD-FUNCTIONS/chol.cc: Delete obsolete test of spcholinv.
--- a/src/pr-output.cc
+++ b/src/pr-output.cc
@@ -3024,7 +3024,7 @@
 }
 
 #define INSTANTIATE_ABS(T) \
-  template /* static */ inline T abs (T)
+  template /* static */ T abs (T)
 
 INSTANTIATE_ABS(signed char);
 INSTANTIATE_ABS(short);