From a4c80b37e38e268cb3d81dce0ffffa91dbf36255 Mon Sep 17 00:00:00 2001
From: Jeremy Siek <jeremy.siek@gmail.com>
Date: Sat, 9 Dec 2000 15:59:54 +0000
Subject: [PATCH] fixed a couple compiler errors

[SVN r8419]
---
 class_concept_check_test.cpp | 2 +-
 concept_check_test.cpp       | 9 +--------
 stl_concept_check.cpp        | 3 +++
 stl_concept_covering.cpp     | 5 ++---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/class_concept_check_test.cpp b/class_concept_check_test.cpp
index dde844d..b54fced 100644
--- a/class_concept_check_test.cpp
+++ b/class_concept_check_test.cpp
@@ -23,7 +23,7 @@ class class_requires_test
 {
   BOOST_CLASS_REQUIRES(int, EqualityComparableConcept);
   typedef int* int_ptr; typedef const int* const_int_ptr;
-  BOOST_CLASS_REQUIRES2(int_ptr, const_int_ptr, Comparable2Concept);
+  BOOST_CLASS_REQUIRES2(int_ptr, const_int_ptr, EqualOpConcept);
   BOOST_CLASS_REQUIRES3(foo, bool, int, UnaryFunctionConcept);
   BOOST_CLASS_REQUIRES4(bar, bool, int, char, BinaryFunctionConcept);
 };
diff --git a/concept_check_test.cpp b/concept_check_test.cpp
index d2932d3..f65cca4 100644
--- a/concept_check_test.cpp
+++ b/concept_check_test.cpp
@@ -142,7 +142,7 @@ main()
     function_requires< InputIteratorConcept<Iter> >();
   }
   {
-    typedef output_iterator_archetype Iter;
+    typedef output_iterator_archetype<int> Iter;
     function_requires< OutputIteratorConcept<Iter, int> >();
   }
   {
@@ -173,13 +173,6 @@ main()
   //===========================================================================
   // Container Concepts
 
-  {
-    
-    function_requires< ContainerConcept< > >();
-  }
-  {
-    
-  }
 
   return 0;
 }
diff --git a/stl_concept_check.cpp b/stl_concept_check.cpp
index f8b18a7..3e982f2 100644
--- a/stl_concept_check.cpp
+++ b/stl_concept_check.cpp
@@ -25,6 +25,9 @@
 #include <slist>
 #endif
 
+// Define this macro if you want to hide the expected error, that is,
+// error in the various C++ standard library implementations.
+//
 //#define BOOST_HIDE_EXPECTED_ERRORS
 
 int
diff --git a/stl_concept_covering.cpp b/stl_concept_covering.cpp
index 1e0a0c2..1a0ffe5 100644
--- a/stl_concept_covering.cpp
+++ b/stl_concept_covering.cpp
@@ -25,7 +25,6 @@
 
 */
 
-#define BOOST_HIDE_EXPECTED_ERRORS
 
   // This is a special concept needed for std::swap_ranges.
   // It is mutually convertible, and also SGIAssignable
@@ -179,7 +178,7 @@ main()
       n = std::count(in, in, value);
     ignore_unused_variable_warning(n);
   }
-#if !defined(__KCC) && !defined(BOOST_HIDE_EXPECTED_ERRORS)
+#if !defined(__KCC)
   {
     typedef equal_op_first_archetype<> Left;
     typedef input_iterator_archetype<Left> InIter;
@@ -190,7 +189,7 @@ main()
   }
   {
     input_iterator_archetype< convertible_to_archetype<null_archetype<> > > in;
-    unary_predicate_archetype<null_archetype<> > pred;
+    unary_predicate_archetype<null_archetype<> > pred(dummy_cons);
     unsigned long n;
     std::count_if(in, in, pred, n);
   }