changeset 11876:b1122c225f6c release-3-0-x

compilation fixes
author Jason Riedy
date Sun, 12 Oct 2008 10:37:07 +0200
parents f53f57d2ee51
children d11919389e09
files liboctave/ChangeLog liboctave/oct-sort.cc
diffstat 2 files changed, 16 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -238,6 +238,11 @@
 
 2008-02-12  Jason Riedy  <ejr@cs.berkeley.edu>
   
+	* Array.cc (ascending_compare, descending_compare): Remove
+	non-standard extern in the instantiations.
+
+	* oct-sort.cc: Include <cstring> and sprinkle with std:: as needed.
+
 	* dMatrix.cc (ILAENV): Declare LAPACK Fortran function.
 	(Matrix::lssolve): Use ILAENV to query smlsiz.  And add an ugly
 	workaround for DGELSD's broken lwork query.  The formula is from
--- a/liboctave/oct-sort.cc
+++ b/liboctave/oct-sort.cc
@@ -85,6 +85,7 @@
 
 #include <cassert>
 #include <cstdlib>
+#include <cstring>
 
 #include "lo-mappers.h"
 #include "quit.h"
@@ -519,7 +520,7 @@
 
   if (MERGE_GETMEM (na) < 0)
     return -1;
-  memcpy (ms.a, pa, na * sizeof (T));
+  std::memcpy (ms.a, pa, na * sizeof (T));
   dest = pa;
   pa = ms.a;
 
@@ -581,7 +582,7 @@
 	    {
 	      if (k < 0)
 		goto Fail;
-	      memcpy (dest, pa, k * sizeof (T));
+	      std::memcpy (dest, pa, k * sizeof (T));
 	      dest += k;
 	      pa += k;
 	      na -= k;
@@ -605,7 +606,7 @@
 	    {
 	      if (k < 0)
 		goto Fail;
-	      memmove (dest, pb, k * sizeof (T));
+	      std::memmove (dest, pb, k * sizeof (T));
 	      dest += k;
 	      pb += k;
 	      nb -= k;
@@ -628,12 +629,12 @@
 
  Fail:
   if (na)
-    memcpy (dest, pa, na * sizeof (T));
+    std::memcpy (dest, pa, na * sizeof (T));
   return result;
 
  CopyB:
   /* The last element of pa belongs at the end of the merge. */
-  memmove (dest, pb, nb * sizeof (T));
+  std::memmove (dest, pb, nb * sizeof (T));
   dest[nb] = *pa;
 
   return 0;
@@ -659,7 +660,7 @@
   if (MERGE_GETMEM (nb) < 0)
     return -1;
   dest = pb + nb - 1;
-  memcpy (ms.a, pb, nb * sizeof (T));
+  std::memcpy (ms.a, pb, nb * sizeof (T));
   basea = pa;
   baseb = ms.a;
   pb = ms.a + nb - 1;
@@ -725,7 +726,7 @@
 	    {
 	      dest -= k;
 	      pa -= k;
-	      memmove (dest+1, pa+1, k * sizeof (T));
+	      std::memmove (dest+1, pa+1, k * sizeof (T));
 	      na -= k;
 	      if (na == 0)
 		goto Succeed;
@@ -744,7 +745,7 @@
 	    {
 	      dest -= k;
 	      pb -= k;
-	      memcpy (dest+1, pb+1, k * sizeof (T));
+	      std::memcpy (dest+1, pb+1, k * sizeof (T));
 	      nb -= k;
 	      if (nb == 1)
 		goto CopyA;
@@ -769,14 +770,14 @@
 
 Fail:
   if (nb)
-    memcpy (dest-(nb-1), baseb, nb * sizeof (T));
+    std::memcpy (dest-(nb-1), baseb, nb * sizeof (T));
   return result;
 
 CopyA:
   /* The first element of pb belongs at the front of the merge. */
   dest -= na;
   pa -= na;
-  memmove (dest+1, pa+1, na * sizeof (T));
+  std::memmove (dest+1, pa+1, na * sizeof (T));
   *dest = *pb;
 
   return 0;