aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-01-17 16:45:34 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-01-20 15:45:47 +0200
commitefe50036fbdca051ac44e76a7b0b8be37076dc9a (patch)
tree961b9ca3a7cc8e168d671891f9a68bd06e7339a6
parentb9e842132ce9d7f1edce15868d205a1e8c77816c (diff)
Don't use min as variable name since it is macro in VC++
-rw-r--r--oracle/types/traits.hxx12
1 files 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;
}