# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1347396077 14400
# Node ID b135f013679ef6ae7b6b22629f3a5d3a5eff8e69
# Parent  b6b261c3eab32bb1640f9230edd7c1a553fd27b9# Parent  4663cc835c65873fe12b599bcab11ba4a8f5fb87
maint: periodic merge of stable to default

diff -r b6b261c3eab3 -r b135f013679e liboctave/array/Sparse.cc
--- a/liboctave/array/Sparse.cc	Tue Sep 11 15:12:44 2012 -0400
+++ b/liboctave/array/Sparse.cc	Tue Sep 11 16:41:17 2012 -0400
@@ -323,9 +323,10 @@
       if (n == 1 && a(0) != T ())
         {
           change_capacity (nzm > 1 ? nzm : 1);
-          xcidx (0) = 0;
-          xridx (0) = r(0);
-          xdata (0) = a(0);
+          xcidx(0) = 0;
+          xridx(0) = r(0);
+          xdata(0) = a(0);
+
           for (octave_idx_type j = 0; j < nc; j++)
             xcidx (j+1) = j >= c(0);
         }
@@ -495,8 +496,8 @@
         new_nz += rd[i-1] != rd[i];
       // Allocate result.
       change_capacity (nzm > new_nz ? nzm : new_nz);
-      xcidx (0) = 0;
-      xcidx (1) = new_nz;
+      xcidx(0) = 0;
+      xcidx(1) = new_nz;
       octave_idx_type *rri = ridx ();
       T *rrd = data ();
 
@@ -1253,7 +1254,7 @@
           else
             {
               const Sparse<T> tmp = *this;
-              octave_idx_type lbi = tmp.cidx (lb), ubi = tmp.cidx (ub),
+              octave_idx_type lbi = tmp.cidx(lb), ubi = tmp.cidx(ub),
                 new_nz = nz - (ubi - lbi);
 
               *this = Sparse<T> (nr, nc - (ub - lb), new_nz);
@@ -1296,20 +1297,20 @@
                                  tmpl.nnz () + tmpu.nnz ());
               for (octave_idx_type j = 0, k = 0; j < nc; j++)
                 {
-                  for (octave_idx_type i = tmpl.cidx (j); i < tmpl.cidx (j+1);
+                  for (octave_idx_type i = tmpl.cidx(j); i < tmpl.cidx(j+1);
                        i++)
                     {
-                      xdata (k) = tmpl.data (i);
-                      xridx (k++) = tmpl.ridx (i);
+                      xdata(k) = tmpl.data(i);
+                      xridx(k++) = tmpl.ridx(i);
                     }
-                  for (octave_idx_type i = tmpu.cidx (j); i < tmpu.cidx (j+1);
+                  for (octave_idx_type i = tmpu.cidx(j); i < tmpu.cidx(j+1);
                        i++)
                     {
-                      xdata (k) = tmpu.data (i);
-                      xridx (k++) = tmpu.ridx (i) + lb;
+                      xdata(k) = tmpu.data(i);
+                      xridx(k++) = tmpu.ridx(i) + lb;
                     }
 
-                  xcidx (j+1) = k;
+                  xcidx(j+1) = k;
                 }
             }
         }