# HG changeset patch # User jwe # Date 1041655571 0 # Node ID 52ce979331fefc0be1c11fbc95d4bcd02dbbee24 # Parent e0f687d372ef8d72d82f66f89daa010e990f5bdc [project @ 2003-01-04 04:46:11 by jwe] diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog --- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,5 +1,8 @@ 2003-01-03 John W. Eaton + * dMatrix.cc (read_int, write_int): Avoid warnings about + unreachable code. + * oct-alloc.h (DECLARE_OCTAVE_ALLOCATOR): Define operator delete to correspond to placement new operator. diff --git a/liboctave/dMatrix.cc b/liboctave/dMatrix.cc --- a/liboctave/dMatrix.cc +++ b/liboctave/dMatrix.cc @@ -2290,13 +2290,12 @@ { is.read (X_CAST (char *, &val), sizeof (T)); - if (swap_bytes) + int t = sizeof (T); + + if (swap_bytes && t > 1) { - switch (sizeof (T)) + switch (t) { - case 1: - break; - case 2: swap_2_bytes (X_CAST (char *, &val)); break; @@ -2586,13 +2585,12 @@ void write_int (std::ostream& os, bool swap_bytes, T val) { - if (swap_bytes) + int t = sizeof (T); + + if (swap_bytes && t > 1) { - switch (sizeof (T)) + switch (t) { - case 1: - break; - case 2: swap_2_bytes (X_CAST (char *, &val)); break;