Mercurial > octave
changeset 21218:2bb4e5a6290d
don't include lo-math.h in header files unnecessarily
* DASPK.h, DASRT.h, DASSL.h, LSODE.h, Quad.h, oct-time.h: Don't
include lo-math.h.
* oct-time.cc (octave_time::octave_time (double)): Move definition
here, from oct-time.h.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 07 Feb 2016 13:19:04 -0500 |
parents | 2a81f4b7b254 |
children | ddf0a5f3a967 |
files | liboctave/numeric/DASPK.h liboctave/numeric/DASRT.h liboctave/numeric/DASSL.h liboctave/numeric/LSODE.h liboctave/numeric/Quad.h liboctave/system/oct-time.cc liboctave/system/oct-time.h |
diffstat | 7 files changed, 8 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/numeric/DASPK.h Sun Feb 07 13:17:28 2016 -0500 +++ b/liboctave/numeric/DASPK.h Sun Feb 07 13:19:04 2016 -0500 @@ -26,7 +26,6 @@ #include <cfloat> #include "DASPK-opts.h" -#include "lo-math.h" class OCTAVE_API
--- a/liboctave/numeric/DASRT.h Sun Feb 07 13:17:28 2016 -0500 +++ b/liboctave/numeric/DASRT.h Sun Feb 07 13:19:04 2016 -0500 @@ -26,7 +26,6 @@ #include <cfloat> #include "DASRT-opts.h" -#include "lo-math.h" class DASRT_result
--- a/liboctave/numeric/DASSL.h Sun Feb 07 13:17:28 2016 -0500 +++ b/liboctave/numeric/DASSL.h Sun Feb 07 13:19:04 2016 -0500 @@ -26,7 +26,6 @@ #include <cfloat> #include "DASSL-opts.h" -#include "lo-math.h" class OCTAVE_API
--- a/liboctave/numeric/LSODE.h Sun Feb 07 13:17:28 2016 -0500 +++ b/liboctave/numeric/LSODE.h Sun Feb 07 13:19:04 2016 -0500 @@ -26,7 +26,6 @@ #include <cfloat> #include "LSODE-opts.h" -#include "lo-math.h" class OCTAVE_API
--- a/liboctave/numeric/Quad.h Sun Feb 07 13:17:28 2016 -0500 +++ b/liboctave/numeric/Quad.h Sun Feb 07 13:19:04 2016 -0500 @@ -27,7 +27,6 @@ #include "dColVector.h" #include "fColVector.h" -#include "lo-math.h" typedef double (*integrand_fcn) (double x); typedef float (*float_integrand_fcn) (float x);
--- a/liboctave/system/oct-time.cc Sun Feb 07 13:17:28 2016 -0500 +++ b/liboctave/system/oct-time.cc Sun Feb 07 13:19:04 2016 -0500 @@ -40,6 +40,13 @@ #include "oct-locbuf.h" #include "oct-time.h" +octave_time::octave_time (double d) + : ot_unix_time (static_cast<time_t> (d)), ot_usec (0) +{ + double ip; + ot_usec = static_cast<int> (std::modf (d, &ip) * 1e6); +} + octave_time::octave_time (const octave_base_tm& tm) : ot_unix_time (), ot_usec () {
--- a/liboctave/system/oct-time.h Sun Feb 07 13:17:28 2016 -0500 +++ b/liboctave/system/oct-time.h Sun Feb 07 13:19:04 2016 -0500 @@ -26,8 +26,6 @@ #include <ctime> #include <string> -#include "lo-math.h" - class octave_base_tm; class @@ -64,12 +62,7 @@ ot_unix_time += extra; } - octave_time (double d) - : ot_unix_time (static_cast<time_t> (d)), ot_usec (0) - { - double ip; - ot_usec = static_cast<int> (std::modf (d, &ip) * 1e6); - } + octave_time (double d); octave_time (const octave_base_tm& tm);