From 40258b5735fac6b03c15f7c4def68dde70c0e790 Mon Sep 17 00:00:00 2001
From: Peder Holt <peder.holt@gmail.com>
Date: Wed, 5 Jan 2005 07:43:44 +0000
Subject: [PATCH] Changed tests to accomodate vintage compiler Updated
 input.txt to accomodate for dinkumware for MSVC 6.5

[SVN r2432]
---
 genreg/input.txt | 31 ++++++++++++++++++++++++++++---
 test/main.cpp    | 16 +++++++++++-----
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/genreg/input.txt b/genreg/input.txt
index 8159d77..99a33d8 100755
--- a/genreg/input.txt
+++ b/genreg/input.txt
@@ -95,14 +95,14 @@ TEMPLATE,std::mem_fun1_t,3
 TEMPLATE,std::mem_fun_ref_t,2
 TEMPLATE,std::mem_fun1_ref_t,3
 
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+#if !BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
 
 TEMPLATE,std::const_mem_fun_t,2
 TEMPLATE,std::const_mem_fun1_t,3
 TEMPLATE,std::const_mem_fun_ref_t,2
 TEMPLATE,std::const_mem_fun1_ref_t,3
 
-#endif//BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+#endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
 
 ~memory
 
@@ -129,7 +129,7 @@ TEMPLATE,std::indirect_array,1
 @memory
 
 TEMPLATE,std::basic_ios,1,2
-TEMPLATE,std::class basic_streambuf,1,2
+TEMPLATE,std::basic_streambuf,1,2
 TEMPLATE,std::basic_istream,1,2
 TEMPLATE,std::basic_ostream,1,2
 TEMPLATE,std::basic_iostream,1,2
@@ -182,17 +182,42 @@ TYPE,std::wstreampos
 @string
 
 TEMPLATE,std::iterator_traits,1
+
+#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
+
+TEMPLATE,std::iterator,2,3
+
+#else
+
 TEMPLATE,std::iterator,2,5
+
+#endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
+
 TYPE,std::input_iterator_tag
 TYPE,std::output_iterator_tag
 TYPE,std::forward_iterator_tag
 TYPE,std::bidirectional_iterator_tag
 TYPE,std::random_access_iterator_tag
+
+#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
+
+TEMPLATE,std::reverse_iterator,2,5
+
+#else
+
 TEMPLATE,std::reverse_iterator,1
+
+#endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
+
 TEMPLATE,std::back_insert_iterator,1
 TEMPLATE,std::front_insert_iterator,1
 TEMPLATE,std::insert_iterator,1
+#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
+TEMPLATE,std::istream_iterator,1,3
+#else
 TEMPLATE,std::istream_iterator,1,4
+#endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
+
 TEMPLATE,std::ostream_iterator,1,3
 TEMPLATE,std::istreambuf_iterator,1,2
 TEMPLATE,std::ostreambuf_iterator,1,2
diff --git a/test/main.cpp b/test/main.cpp
index 8e0915b..3e0990b 100755
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -27,6 +27,9 @@
 #include <boost/typeof/std/bitset.hpp>
 #include <boost/typeof/std/functional.hpp>
 #include <boost/typeof/std/valarray.hpp>
+#include <boost/typeof/std/locale.hpp>
+#include <boost/typeof/std/iterator.hpp>
+#include <boost/typeof/std/iosfwd.hpp>
 
 #include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
 
@@ -78,9 +81,12 @@ BOOST_STATIC_ASSERT(typeof_test<double(*)(int, double, short, char*, bool, char,
 BOOST_STATIC_ASSERT(typeof_test<void(*)()>::value);
 BOOST_STATIC_ASSERT(typeof_test<void(*)(int, double, short, char*, bool, char, float, long, unsigned short)>::value);
 
-#pragma message("function references...")
-BOOST_STATIC_ASSERT(typeof_test<void(&)()>::value);
-BOOST_STATIC_ASSERT(typeof_test<int(&)(int, short)>::value);
+
+#ifdef BOOST_TYPEOF_COMPLIANT
+#  pragma message("function references...")
+   BOOST_STATIC_ASSERT(typeof_test<void(&)()>::value);
+   BOOST_STATIC_ASSERT(typeof_test<int(&)(int, short)>::value);
+#endif//BOOST_TYPEOF_COMPLIANT
 
 #ifdef BOOST_TYPEOF_COMPLIANT 
 #   pragma message("function values...")
@@ -180,8 +186,8 @@ BOOST_STATIC_ASSERT(typeof_test<less_equal<int> >::value);
 BOOST_STATIC_ASSERT(typeof_test<logical_and<int> >::value);
 BOOST_STATIC_ASSERT(typeof_test<logical_or<int> >::value);
 BOOST_STATIC_ASSERT(typeof_test<logical_not<int> >::value);
-BOOST_STATIC_ASSERT(typeof_test<unary_negate<int> >::value);
-BOOST_STATIC_ASSERT(typeof_test<binary_negate<int> >::value);
+BOOST_STATIC_ASSERT(typeof_test<unary_negate<negate<int> > >::value);
+BOOST_STATIC_ASSERT(typeof_test<binary_negate<less<int> > >::value);
 BOOST_STATIC_ASSERT(typeof_test<binder1st<less<int> > >::value);
 BOOST_STATIC_ASSERT(typeof_test<binder2nd<less<int> > >::value);