From 3c2a976d2a0e62aefece9ba137ed766c2d7b3a1b Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Sun, 30 Apr 2006 03:01:58 +0000
Subject: [PATCH] Workarounds for a nasty vc-7.1 bug that only shows up in the
 iterator library tests.

[SVN r33866]
---
 include/boost/concept_check/Attic/msvc.hpp | 92 ++++++++++++++--------
 include/boost/concept_check/msvc.hpp       | 92 ++++++++++++++--------
 2 files changed, 120 insertions(+), 64 deletions(-)

diff --git a/include/boost/concept_check/Attic/msvc.hpp b/include/boost/concept_check/Attic/msvc.hpp
index 102cc07..3968469 100755
--- a/include/boost/concept_check/Attic/msvc.hpp
+++ b/include/boost/concept_check/Attic/msvc.hpp
@@ -11,52 +11,80 @@
 
 
 namespace boost
-{  
-  template <class Model>
-  struct concept_check
+{
+  namespace concept_checking
   {
-      virtual void failed(Model* x)
-      {
-          x->~Model();
-      }
-      
-      int test;
-  };
-
+    template <class Model>
+    struct concept_check_
+    {
+        virtual void failed(Model* x)
+        {
+            x->~Model();
+        }
+    };
+  }
+  
 # ifdef BOOST_OLD_CONCEPT_SUPPORT
   
-  template <class Model>
-  struct constraint_check
+  namespace concept_checking
   {
-      virtual void failed(Model* x)
-      {
-          x->constraints();
-      }
+    template <class Model>
+    struct constraint_check
+    {
+        virtual void failed(Model* x)
+        {
+            x->constraints();
+        }
+    };
+  }
+
+  template <class Model>
+  struct concept_check
+    : mpl::if_c<
+          concept_checking::has_constraints<Model>::value
+        , concept_checking::constraint_check<Model>
+        , concept_checking::concept_check_<Model>
+      >::type
+  {};
       
-      int test;
-  };
+# else
   
   template <class Model>
-  typename mpl::if_c<
-      concept_checking::has_constraints<Model>::value
-    , constraint_check<Model>
-    , concept_check<Model>
-  >::type concept_check_(void(*)(Model));
+  struct concept_check
+    : concept_checking::concept_check_<Model>
+  {};
+  
+# endif
+
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+
+  //
+  // The iterator library sees some really strange errors unless we
+  // use partial specialization to extract the model type with
+  // msvc-7.1
+  // 
+  template <class Model>
+  struct concept_check<void(*)(Model)>
+    : concept_check<Model>
+  { };
+
+# define BOOST_CONCEPT_ASSERT( ModelInParens )                          \
+  enum { BOOST_PP_CAT(boost_concept_check,__LINE__) =                   \
+         sizeof(::boost::concept_check<void(*) ModelInParens>)          \
+  }
   
 # else
   
   template <class Model>
-  concept_check<Model> concept_check_(void(*)(Model));
+  concept_check<Model>
+  concept_check_(void(*)(Model));
   
-# endif
-  
-  // Usage, in class or function context:
-  //
-  //     BOOST_CONCEPT_ASSERT((UnaryFunctionConcept<F,bool,int>));
-#  define BOOST_CONCEPT_ASSERT( ModelInParens )                         \
+# define BOOST_CONCEPT_ASSERT( ModelInParens )                          \
   enum { BOOST_PP_CAT(boost_concept_check,__LINE__) =                   \
-         sizeof(boost::concept_check_((void(*) ModelInParens)0).test)   \
+         sizeof(::boost::concept_check_((void(*) ModelInParens)0))      \
   }
+  
+# endif 
 }
 
 #endif // BOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP
diff --git a/include/boost/concept_check/msvc.hpp b/include/boost/concept_check/msvc.hpp
index 102cc07..3968469 100755
--- a/include/boost/concept_check/msvc.hpp
+++ b/include/boost/concept_check/msvc.hpp
@@ -11,52 +11,80 @@
 
 
 namespace boost
-{  
-  template <class Model>
-  struct concept_check
+{
+  namespace concept_checking
   {
-      virtual void failed(Model* x)
-      {
-          x->~Model();
-      }
-      
-      int test;
-  };
-
+    template <class Model>
+    struct concept_check_
+    {
+        virtual void failed(Model* x)
+        {
+            x->~Model();
+        }
+    };
+  }
+  
 # ifdef BOOST_OLD_CONCEPT_SUPPORT
   
-  template <class Model>
-  struct constraint_check
+  namespace concept_checking
   {
-      virtual void failed(Model* x)
-      {
-          x->constraints();
-      }
+    template <class Model>
+    struct constraint_check
+    {
+        virtual void failed(Model* x)
+        {
+            x->constraints();
+        }
+    };
+  }
+
+  template <class Model>
+  struct concept_check
+    : mpl::if_c<
+          concept_checking::has_constraints<Model>::value
+        , concept_checking::constraint_check<Model>
+        , concept_checking::concept_check_<Model>
+      >::type
+  {};
       
-      int test;
-  };
+# else
   
   template <class Model>
-  typename mpl::if_c<
-      concept_checking::has_constraints<Model>::value
-    , constraint_check<Model>
-    , concept_check<Model>
-  >::type concept_check_(void(*)(Model));
+  struct concept_check
+    : concept_checking::concept_check_<Model>
+  {};
+  
+# endif
+
+# if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+
+  //
+  // The iterator library sees some really strange errors unless we
+  // use partial specialization to extract the model type with
+  // msvc-7.1
+  // 
+  template <class Model>
+  struct concept_check<void(*)(Model)>
+    : concept_check<Model>
+  { };
+
+# define BOOST_CONCEPT_ASSERT( ModelInParens )                          \
+  enum { BOOST_PP_CAT(boost_concept_check,__LINE__) =                   \
+         sizeof(::boost::concept_check<void(*) ModelInParens>)          \
+  }
   
 # else
   
   template <class Model>
-  concept_check<Model> concept_check_(void(*)(Model));
+  concept_check<Model>
+  concept_check_(void(*)(Model));
   
-# endif
-  
-  // Usage, in class or function context:
-  //
-  //     BOOST_CONCEPT_ASSERT((UnaryFunctionConcept<F,bool,int>));
-#  define BOOST_CONCEPT_ASSERT( ModelInParens )                         \
+# define BOOST_CONCEPT_ASSERT( ModelInParens )                          \
   enum { BOOST_PP_CAT(boost_concept_check,__LINE__) =                   \
-         sizeof(boost::concept_check_((void(*) ModelInParens)0).test)   \
+         sizeof(::boost::concept_check_((void(*) ModelInParens)0))      \
   }
+  
+# endif 
 }
 
 #endif // BOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP