# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1297198777 18000
# Node ID 1cf28ef2bb88b7b7cc55c9266f938fe35406bcbf
# Parent  b7d0d6044bd7cecabd7c2abdd4e072bf7102e0bc
small changes for GCC 4.6

diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- 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
diff --git a/liboctave/oct-alloc.h b/liboctave/oct-alloc.h
--- 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
diff --git a/src/ChangeLog b/src/ChangeLog
--- 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.
diff --git a/src/pr-output.cc b/src/pr-output.cc
--- 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);