diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-10-28 02:34:40 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-10-28 02:34:40 -0400 |
| commit | bd96928410124e70e70ada7fd05820e2cf781d2c (patch) | |
| tree | a054e62051e8a2cdb7351f9b166a1fba5d5ba43f /src/times.h | |
| parent | ade0a8b6f3eeb893eda2ae7355d503bf6514f147 (diff) | |
| parent | 65e8eca6cfd394390c1e2091cf8674a93d2eae2d (diff) | |
| download | fork-ledger-bd96928410124e70e70ada7fd05820e2cf781d2c.tar.gz fork-ledger-bd96928410124e70e70ada7fd05820e2cf781d2c.tar.bz2 fork-ledger-bd96928410124e70e70ada7fd05820e2cf781d2c.zip | |
Merge branch 'next'
Diffstat (limited to 'src/times.h')
| -rw-r--r-- | src/times.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/times.h b/src/times.h index 035d86cd..69e3af51 100644 --- a/src/times.h +++ b/src/times.h @@ -69,11 +69,11 @@ inline bool is_valid(const date_t& moment) { extern optional<datetime_t> epoch; #ifdef BOOST_DATE_TIME_HAS_HIGH_PRECISION_CLOCK -#define CURRENT_TIME() \ - (epoch ? *epoch : boost::posix_time::microsec_clock::universal_time()) +#define TRUE_CURRENT_TIME() (boost::posix_time::microsec_clock::universal_time()) +#define CURRENT_TIME() (epoch ? *epoch : TRUE_CURRENT_TIME()) #else -#define CURRENT_TIME() \ - (epoch ? *epoch : boost::posix_time::second_clock::universal_time()) +#define TRUE_CURRENT_TIME() (boost::posix_time::second_clock::universal_time()) +#define CURRENT_TIME() (epoch ? *epoch : TRUE_CURRENT_TIME()) #endif #define CURRENT_DATE() \ (epoch ? epoch->date() : boost::gregorian::day_clock::universal_day()) |