Mercurial > octave-nkf
changeset 10458:9684b3c3b417
Revert modf usage now that cmath is back.
author | David Grundberg <davidg@cs.umu.se> |
---|---|
date | Thu, 25 Mar 2010 11:38:07 +0100 |
parents | 56e3a4c765a6 |
children | 20ce1bea653d |
files | liboctave/ChangeLog liboctave/oct-time.h |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Thu Mar 25 10:22:46 2010 +0100 +++ b/liboctave/ChangeLog Thu Mar 25 11:38:07 2010 +0100 @@ -1,3 +1,8 @@ +2010-03-25 David Grundberg <davidg@cs.umu.se> + + * oct-time.h (octave_time): Revert ::modf to std::modf again now + that cmath is included again. + 2010-03-25 Jaroslav Hajek <highegg@gmail.com> * lo-math.h: Include both "math.h" and "cmath".
--- a/liboctave/oct-time.h Thu Mar 25 10:22:46 2010 +0100 +++ b/liboctave/oct-time.h Thu Mar 25 11:38:07 2010 +0100 @@ -68,7 +68,7 @@ : ot_unix_time (static_cast<time_t> (d)), ot_usec (0) { double ip; - ot_usec = static_cast<int> (::modf (d, &ip) * 1e6); + ot_usec = static_cast<int> (std::modf (d, &ip) * 1e6); } octave_time (const octave_base_tm& tm);