From d0c4fe7914c3da8e14c97c709c8a53f00bc6a702 Mon Sep 17 00:00:00 2001 From: Thomas Witt Date: Fri, 1 Jun 2007 16:12:08 +0000 Subject: [PATCH] Patches from Trac #583. [SVN r37846] --- stl_concept_covering.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stl_concept_covering.cpp b/stl_concept_covering.cpp index 5b05beb..3d60a80 100644 --- a/stl_concept_covering.cpp +++ b/stl_concept_covering.cpp @@ -591,7 +591,7 @@ main() std::nth_element(ri, ri, ri, comp); } { -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__IBMCPP__) typedef less_than_op_first_archetype<> FT; typedef less_than_op_second_archetype<> T; #elif defined(__KCC) @@ -615,7 +615,7 @@ main() fi = std::lower_bound(fi, fi, value, comp); } { -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__IBMCPP__) // Note, order of T,FT is flipped from lower_bound typedef less_than_op_second_archetype<> FT; typedef less_than_op_first_archetype<> T; @@ -639,7 +639,7 @@ main() fi = std::upper_bound(fi, fi, value, comp); } { -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__IBMCPP__) typedef less_than_op_first_archetype< less_than_op_second_archetype< null_archetype<>, optag2>, optag1> FT; typedef less_than_op_second_archetype< @@ -669,7 +669,7 @@ main() ignore_unused_variable_warning(p); } { -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__IBMCPP__) typedef less_than_op_first_archetype< less_than_op_second_archetype, optag2>, optag1> FT; typedef less_than_op_second_archetype< @@ -686,7 +686,7 @@ main() { typedef null_archetype Arg1; typedef null_archetype Arg2; -#if defined(__GNUC__) || defined(__KCC) +#if defined(__GNUC__) || defined(__KCC) || defined(__IBMCPP__) typedef convertible_to_archetype > FT; typedef convertible_to_archetype Tout; -#if defined(__GNUC__) || defined(__KCC) +#if defined(__GNUC__) || defined(__KCC) || defined(__IBMCPP__) typedef less_than_op_first_archetype< less_than_op_second_archetype< convertible_to_archetype, optag2>, optag1 > Tin1;