diff options
| author | Constantin Michael <constantin@codesynthesis.com> | 2011-11-24 09:44:27 +0200 |
|---|---|---|
| committer | Constantin Michael <constantin@codesynthesis.com> | 2011-11-24 09:44:27 +0200 |
| commit | 1269dad0878346e177709a0f1a4fa746bcb62563 (patch) | |
| tree | 0e827643a52da4225f1ad35a670ecf21c0ea04ae | |
| parent | 4a5f1f5c8202e4a7833db4614e6cfe47e00be102 (diff) | |
Rename min to minute to avoid clash with unfortunately named MSVC macro
| -rw-r--r-- | odb/qt/date-time/oracle/qdate-time-traits.hxx | 6 | ||||
| -rw-r--r-- | odb/qt/date-time/oracle/qdate-traits.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/odb/qt/date-time/oracle/qdate-time-traits.hxx b/odb/qt/date-time/oracle/qdate-time-traits.hxx index 6c45d5e..40f66b8 100644 --- a/odb/qt/date-time/oracle/qdate-time-traits.hxx +++ b/odb/qt/date-time/oracle/qdate-time-traits.hxx @@ -33,15 +33,15 @@ namespace odb else { sb2 y (0); - ub1 m (0), d (0), h (0), min (0), s (0); + ub1 m (0), d (0), h (0), minute (0), s (0); ub4 ns (0); - i.get (y, m, d, h, min, s, ns); + i.get (y, m, d, h, minute, s, ns); v = QDateTime (QDate (static_cast<int> (y), static_cast<int> (m), static_cast<int> (d)), QTime (static_cast<int> (h), - static_cast<int> (min), + static_cast<int> (minute), static_cast<int> (s), static_cast<int> (ns / 1000000))); } diff --git a/odb/qt/date-time/oracle/qdate-traits.hxx b/odb/qt/date-time/oracle/qdate-traits.hxx index 4d4f9db..4ac9716 100644 --- a/odb/qt/date-time/oracle/qdate-traits.hxx +++ b/odb/qt/date-time/oracle/qdate-traits.hxx @@ -38,8 +38,8 @@ namespace odb else { short y (0); - unsigned char m (0), d (0), h (0), min (0), s (0); - details::get_date (b, y, m, d, h, min, s); + unsigned char m (0), d (0), h (0), minute (0), s (0); + details::get_date (b, y, m, d, h, minute, s); v.setDate (y, m, d); } |