From efe50036fbdca051ac44e76a7b0b8be37076dc9a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 17 Jan 2012 16:45:34 +0200 Subject: Don't use min as variable name since it is macro in VC++ --- oracle/types/traits.hxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/oracle/types/traits.hxx b/oracle/types/traits.hxx index 46223ea..e47e1ea 100644 --- a/oracle/types/traits.hxx +++ b/oracle/types/traits.hxx @@ -31,15 +31,15 @@ namespace odb if (!is_null) { short y (0); - unsigned char m (0), d (0), h (0), min (0), s (0); + unsigned char m (0), d (0), h (0), mins (0), s (0); - details::get_date (i, y, m, d, h, min, s); + details::get_date (i, y, m, d, h, mins, s); v.year = y; v.month = m; v.day = d; v.hour = h; - v.minute = min; + v.minute = mins; v.second = s; // Oracle DATE does not support fractional seconds. @@ -76,16 +76,16 @@ namespace odb if (!is_null) { sb2 y (0); - ub1 m (0), d (0), h (0), min (0), s (0); + ub1 m (0), d (0), h (0), mins (0), s (0); ub4 ns (0); - i.get (y, m, d, h, min, s, ns); + i.get (y, m, d, h, mins, s, ns); v.year = y; v.month = m; v.day = d; v.hour = h; - v.minute = min; + v.minute = mins; v.second = s; v.nanosecond = ns; } -- cgit v1.1