diff options
| author | Constantin Michael <constantin@codesynthesis.com> | 2011-11-24 09:42:49 +0200 |
|---|---|---|
| committer | Constantin Michael <constantin@codesynthesis.com> | 2011-11-24 09:42:49 +0200 |
| commit | 79ac0a00db6c65fe3d815ebb1d18e2a7957d66d3 (patch) | |
| tree | b995b4523f46136989d9b9f4b58af1620e48f692 /odb/boost/date-time/oracle/gregorian-traits.hxx | |
| parent | 1285f207175fe0909b9e1143706175e0935b34db (diff) | |
Rename min to minute to avoid clash with unfortunately named MSVC macro
Diffstat (limited to 'odb/boost/date-time/oracle/gregorian-traits.hxx')
| -rw-r--r-- | odb/boost/date-time/oracle/gregorian-traits.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/odb/boost/date-time/oracle/gregorian-traits.hxx b/odb/boost/date-time/oracle/gregorian-traits.hxx index c8cda41..7bb6144 100644 --- a/odb/boost/date-time/oracle/gregorian-traits.hxx +++ b/odb/boost/date-time/oracle/gregorian-traits.hxx @@ -37,9 +37,9 @@ namespace odb else { short y; - unsigned char m, d, h, min, s; + unsigned char m, d, h, minute, s; - details::get_date (b, y, m, d, h, min, s); + details::get_date (b, y, m, d, h, minute, s); v = date (static_cast<date::year_type> (y), static_cast<date::month_type> (m), |