diff -ru boost_1_34_0/libs/concept_check/stl_concept_covering.cpp boost_1_34_0_ibm/libs/concept_check/stl_concept_covering.cpp
old
|
new
|
|
591 | 591 | std::nth_element(ri, ri, ri, comp); |
592 | 592 | } |
593 | 593 | { |
594 | | #if defined(__GNUC__) |
| 594 | #if defined(__GNUC__) || defined(__IBMCPP__) |
595 | 595 | typedef less_than_op_first_archetype<> FT; |
596 | 596 | typedef less_than_op_second_archetype<> T; |
597 | 597 | #elif defined(__KCC) |
… |
… |
|
615 | 615 | fi = std::lower_bound(fi, fi, value, comp); |
616 | 616 | } |
617 | 617 | { |
618 | | #if defined(__GNUC__) |
| 618 | #if defined(__GNUC__) || defined(__IBMCPP__) |
619 | 619 | // Note, order of T,FT is flipped from lower_bound |
620 | 620 | typedef less_than_op_second_archetype<> FT; |
621 | 621 | typedef less_than_op_first_archetype<> T; |
… |
… |
|
639 | 639 | fi = std::upper_bound(fi, fi, value, comp); |
640 | 640 | } |
641 | 641 | { |
642 | | #if defined(__GNUC__) |
| 642 | #if defined(__GNUC__) || defined(__IBMCPP__) |
643 | 643 | typedef less_than_op_first_archetype< |
644 | 644 | less_than_op_second_archetype< null_archetype<>, optag2>, optag1> FT; |
645 | 645 | typedef less_than_op_second_archetype< |
… |
… |
|
669 | 669 | ignore_unused_variable_warning(p); |
670 | 670 | } |
671 | 671 | { |
672 | | #if defined(__GNUC__) |
| 672 | #if defined(__GNUC__) || defined(__IBMCPP__) |
673 | 673 | typedef less_than_op_first_archetype< |
674 | 674 | less_than_op_second_archetype<null_archetype<>, optag2>, optag1> FT; |
675 | 675 | typedef less_than_op_second_archetype< |
… |
… |
|
686 | 686 | { |
687 | 687 | typedef null_archetype<int> Arg1; |
688 | 688 | typedef null_archetype<char> Arg2; |
689 | | #if defined(__GNUC__) || defined(__KCC) |
| 689 | #if defined(__GNUC__) || defined(__KCC) || defined(__IBMCPP__) |
690 | 690 | typedef convertible_to_archetype<Arg1, |
691 | 691 | convertible_to_archetype<Arg2> > FT; |
692 | 692 | typedef convertible_to_archetype<Arg2, |
… |
… |
|
701 | 701 | } |
702 | 702 | { |
703 | 703 | typedef null_archetype<> Tout; |
704 | | #if defined(__GNUC__) || defined(__KCC) |
| 704 | #if defined(__GNUC__) || defined(__KCC) || defined(__IBMCPP__) |
705 | 705 | typedef less_than_op_first_archetype< |
706 | 706 | less_than_op_second_archetype< |
707 | 707 | convertible_to_archetype<Tout>, optag2>, optag1 > Tin1; |