From b275b77f0eca39e6fbd6b64a005b498018de2d58 Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Fri, 30 May 2003 23:18:25 +0000
Subject: [PATCH] fix Borland regression

[SVN r18621]
---
 include/boost/mpl/vector/aux_/iterator.hpp | 29 ++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/include/boost/mpl/vector/aux_/iterator.hpp b/include/boost/mpl/vector/aux_/iterator.hpp
index 2a6f513..d4eaf28 100644
--- a/include/boost/mpl/vector/aux_/iterator.hpp
+++ b/include/boost/mpl/vector/aux_/iterator.hpp
@@ -1,9 +1,11 @@
-//-----------------------------------------------------------------------------
-// boost mpl/aux_/vector/iterator.hpp header file
-// See http://www.boost.org for updates, documentation, and revision history.
-//-----------------------------------------------------------------------------
-//
-// Copyright (c) 2000-02
+
+#ifndef BOOST_MPL_AUX_VECTOR_ITERATOR_HPP_INCLUDED
+#define BOOST_MPL_AUX_VECTOR_ITERATOR_HPP_INCLUDED
+
+// + file: boost/mpl/aux_/vector/iterator.hpp
+// + last modified: 30/may/03
+
+// Copyright (c) 2000-03
 // Aleksey Gurtovoy
 //
 // Permission to use, copy, modify, distribute and sell this software
@@ -13,16 +15,16 @@
 // supporting documentation. No representations are made about the 
 // suitability of this software for any purpose. It is provided "as is" 
 // without express or implied warranty.
-
-#ifndef BOOST_MPL_AUX_VECTOR_ITERATOR_HPP_INCLUDED
-#define BOOST_MPL_AUX_VECTOR_ITERATOR_HPP_INCLUDED
+//
+// See http://www.boost.org/libs/mpl for documentation.
 
 #include "boost/mpl/iterator_tag.hpp"
 #include "boost/mpl/plus.hpp"
 #include "boost/mpl/minus.hpp"
+#include "boost/mpl/vector/aux_/item.hpp"
 #include "boost/mpl/aux_/iterator_names.hpp"
 #include "boost/mpl/aux_/value_wknd.hpp"
-#include "boost/mpl/vector/aux_/item.hpp"
+#include "boost/mpl/aux_/config/workaround.hpp"
 
 namespace boost {
 namespace mpl {
@@ -54,8 +56,15 @@ struct vector_iterator
 
     template< typename Other >
     struct BOOST_MPL_AUX_ITERATOR_DISTANCE
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
         : minus<typename Other::pos,Pos>
     {
+#else
+    {
+        typedef typename minus<typename Other::pos,Pos>::type type;
+        BOOST_STATIC_CONSTANT(typename Pos::value_type
+            , value = (minus<typename Other::pos,Pos>::value));
+#endif
     };
 };