Please consider these 2 changesets

[John W. Eaton]

On 23-Apr-2008, Michael Goffioul wrote:

| Please consider the following changesets for inclusion into
| main octave archive. One of them fixes the CRLF problem
| I reported earlier (basically, the problem is that MSVC messes
| up things with ftell/fseek for files opened in text-mode, hence
| with CRLF translation).
| 
| http://hg.tw-math.de/octave-graphics/rev/5d199a0677d4

I applied this one.

Thanks,

jwe


# HG changeset patch
# User Michael Goffioul <address@hidden>
# Date 1209140264 14400
# Node ID 6848970153ba5e2e1b59284bd258d91abd2e0e96
# Parent  2dee19385d32f869a2bd0a2b6cd3de5a108850c9
do not use output value of fill_n (not supported by MSVC).

diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@ 2008-04-24  Michael Goffioul  <michael.g
+2008-04-25  Michael Goffioul <address@hidden>
+
+       * oct-lookup.h (seq_lookup): Do not use output value of fill_n (MSVC
+       does not support it).
+
 2008-04-24  Michael Goffioul  <address@hidden>
 
        * lo-sysdep.cc (octave_popen2): Don't set PIPE_NOWAIT for parentWrite.
diff --git a/liboctave/oct-lookup.h b/liboctave/oct-lookup.h
--- a/liboctave/oct-lookup.h
+++ b/liboctave/oct-lookup.h
@@ -132,7 +132,8 @@ seq_lookup (const T *table, octave_idx_t
                                  bind2nd (comp, *(cur-1)));
 
           // store index of the current interval.
-          idx = std::fill_n (idx, vnew - vcur, cur - table);
+          std::fill_n (idx, vnew - vcur, cur - table);
+         idx += (vnew - vcur);
           vcur = vnew;
 
         }