Ticket #583: libs-concept_check-stl_concept_covering_cpp.patch

File libs-concept_check-stl_concept_covering_cpp.patch, 2.1 KB (added by Thomas Witt, 15 years ago)
  • libs/concept_check/stl_concept_covering.cpp

    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  
    591591    std::nth_element(ri, ri, ri, comp);
    592592  }
    593593  {
    594 #if defined(__GNUC__)
     594#if defined(__GNUC__) || defined(__IBMCPP__)
    595595    typedef less_than_op_first_archetype<> FT;
    596596    typedef less_than_op_second_archetype<> T;
    597597#elif defined(__KCC)
     
    615615    fi = std::lower_bound(fi, fi, value, comp);
    616616  }
    617617  {
    618 #if defined(__GNUC__)
     618#if defined(__GNUC__)  || defined(__IBMCPP__)
    619619    // Note, order of T,FT is flipped from lower_bound
    620620    typedef less_than_op_second_archetype<> FT;
    621621    typedef less_than_op_first_archetype<> T;
     
    639639    fi = std::upper_bound(fi, fi, value, comp);
    640640  }
    641641  {
    642 #if defined(__GNUC__)
     642#if defined(__GNUC__) || defined(__IBMCPP__)
    643643    typedef less_than_op_first_archetype<
    644644      less_than_op_second_archetype< null_archetype<>, optag2>, optag1> FT;
    645645    typedef less_than_op_second_archetype<
     
    669669    ignore_unused_variable_warning(p);
    670670  }
    671671  {
    672 #if defined(__GNUC__)
     672#if defined(__GNUC__)  || defined(__IBMCPP__)
    673673    typedef less_than_op_first_archetype<
    674674      less_than_op_second_archetype<null_archetype<>, optag2>, optag1> FT;
    675675    typedef less_than_op_second_archetype<
     
    686686  {
    687687    typedef null_archetype<int> Arg1;
    688688    typedef null_archetype<char> Arg2;
    689 #if defined(__GNUC__) || defined(__KCC)
     689#if defined(__GNUC__) || defined(__KCC) || defined(__IBMCPP__)
    690690    typedef convertible_to_archetype<Arg1,
    691691      convertible_to_archetype<Arg2> > FT;
    692692    typedef convertible_to_archetype<Arg2,
     
    701701  }
    702702  {
    703703    typedef null_archetype<> Tout;
    704 #if defined(__GNUC__) || defined(__KCC)
     704#if defined(__GNUC__) || defined(__KCC) || defined(__IBMCPP__)
    705705    typedef less_than_op_first_archetype<
    706706      less_than_op_second_archetype<
    707707      convertible_to_archetype<Tout>, optag2>, optag1 > Tin1;