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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'odb/boost/date-time/oracle/gregorian-traits.hxx')

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),
-- 
cgit v1.1