This commit was manufactured by cvs2svn to create tag

'Version_1_34_0_RC2'.

[SVN r37655]

build/Jamfile.v2

@@ -45,10 +45,6 @@ rule check-icu-config ( )
             {
                gICU_CORE_LIB = icuuc ;
             }
-            else if [ GLOB $(dir)/lib : icuuc.* ]
-            {
-               gICU_CORE_LIB = icuuc ;
-            }
             else if [ GLOB $(dir)/lib : libicuuc.* ]
             {
                gICU_CORE_LIB = icuuc ;
@@ -192,4 +188,3 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
 
 
 
-

include/boost/regex/v4/basic_regex.hpp

@@ -254,7 +254,7 @@ public:
    {
       return do_assign(p1, p2, f);
    }
-#if !defined(BOOST_NO_MEMBER_TEMPLATES)
+#if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__)
 
    template <class ST, class SA>
    unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal)
@@ -590,7 +590,7 @@ public:
       return this->assign(that);
    }
 
-#if !defined(BOOST_NO_MEMBER_TEMPLATES)
+#if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__)
    template <class ST, class SA>
    explicit reg_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal)
    : basic_regex<charT, traits>(p, f)

test/regress/test_icu.cpp

@@ -39,8 +39,8 @@ class back_insert_iterator
 {
 private:
    Seq* container;
-public:
    typedef const typename Seq::value_type value_type;
+public:
    typedef Seq                  container_type;
    typedef std::output_iterator_tag  iterator_category;
 
@@ -647,4 +647,3 @@ void test_icu(const wchar_t&, const test_invalid_regex_tag&){}
 void test_icu(const wchar_t&, const test_regex_replace_tag&){}
 
 #endif
-