From 79ac0a00db6c65fe3d815ebb1d18e2a7957d66d3 Mon Sep 17 00:00:00 2001
From: Constantin Michael <constantin@codesynthesis.com>
Date: Thu, 24 Nov 2011 09:42:49 +0200
Subject: Rename min to minute to avoid clash with unfortunately named MSVC
 macro

---
 odb/boost/date-time/oracle/gregorian-traits.hxx  | 4 ++--
 odb/boost/date-time/oracle/posix-time-traits.hxx | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'odb/boost')

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),
diff --git a/odb/boost/date-time/oracle/posix-time-traits.hxx b/odb/boost/date-time/oracle/posix-time-traits.hxx
index 04e7fea..18083c4 100644
--- a/odb/boost/date-time/oracle/posix-time-traits.hxx
+++ b/odb/boost/date-time/oracle/posix-time-traits.hxx
@@ -42,10 +42,10 @@ namespace odb
         else
         {
           sb2 y;
-          ub1 m, d, h, min, s;
+          ub1 m, d, h, minute, s;
           ub4 ns;
 
-          i.get (y, m, d, h, min, s, ns);
+          i.get (y, m, d, h, minute, s, ns);
 
           unsigned long long fract_s (ns);
           fract_s = fract_s * time_duration::ticks_per_second () /
@@ -57,7 +57,7 @@ namespace odb
                   static_cast<date::day_type> (d)),
             time_duration (
               static_cast<time_duration::hour_type> (h),
-              static_cast<time_duration::min_type> (min),
+              static_cast<time_duration::min_type> (minute),
               static_cast<time_duration::sec_type> (s),
               static_cast<time_duration::fractional_seconds_type> (fract_s)));
         }
-- 
cgit v1.1