diff --git a/include/boost/regex/icu.hpp b/include/boost/regex/icu.hpp index 772806e9..a8c52814 100644 --- a/include/boost/regex/icu.hpp +++ b/include/boost/regex/icu.hpp @@ -423,7 +423,7 @@ bool do_regex_match(BidiIterator first, BidiIterator last, { typedef u16_to_u32_iterator conv_type; typedef match_results match_type; - typedef typename match_type::allocator_type alloc_type; + //typedef typename match_type::allocator_type alloc_type; match_type what; bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags); // copy results across to m: @@ -439,7 +439,7 @@ bool do_regex_match(BidiIterator first, BidiIterator last, { typedef u8_to_u32_iterator conv_type; typedef match_results match_type; - typedef typename match_type::allocator_type alloc_type; + //typedef typename match_type::allocator_type alloc_type; match_type what; bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags); // copy results across to m: @@ -598,7 +598,7 @@ bool do_regex_search(BidiIterator first, BidiIterator last, { typedef u16_to_u32_iterator conv_type; typedef match_results match_type; - typedef typename match_type::allocator_type alloc_type; + //typedef typename match_type::allocator_type alloc_type; match_type what; bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base)); // copy results across to m: @@ -615,7 +615,7 @@ bool do_regex_search(BidiIterator first, BidiIterator last, { typedef u8_to_u32_iterator conv_type; typedef match_results match_type; - typedef typename match_type::allocator_type alloc_type; + //typedef typename match_type::allocator_type alloc_type; match_type what; bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base)); // copy results across to m: diff --git a/include/boost/regex/pending/static_mutex.hpp b/include/boost/regex/pending/static_mutex.hpp index 9c10050b..5459ef86 100644 --- a/include/boost/regex/pending/static_mutex.hpp +++ b/include/boost/regex/pending/static_mutex.hpp @@ -36,14 +36,7 @@ // namespace boost{ -class BOOST_REGEX_DECL scoped_static_mutex_lock; - -class static_mutex -{ -public: - typedef scoped_static_mutex_lock scoped_lock; - pthread_mutex_t m_mutex; -}; +class static_mutex; #define BOOST_STATIC_MUTEX_INIT { PTHREAD_MUTEX_INITIALIZER, } @@ -67,6 +60,12 @@ private: bool m_have_lock; }; +class static_mutex +{ +public: + typedef scoped_static_mutex_lock scoped_lock; + pthread_mutex_t m_mutex; +}; } // namespace boost #elif defined(BOOST_HAS_WINTHREADS) diff --git a/include/boost/regex/v4/regex_format.hpp b/include/boost/regex/v4/regex_format.hpp index 3b1d19da..13198fc9 100644 --- a/include/boost/regex/v4/regex_format.hpp +++ b/include/boost/regex/v4/regex_format.hpp @@ -1064,7 +1064,7 @@ struct format_functor_c_string template OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits()) { - typedef typename Match::char_type char_type; + //typedef typename Match::char_type char_type; const charT* end = func; while(*end) ++end; return regex_format_imp(i, m, func, end, f, t); @@ -1083,7 +1083,7 @@ struct format_functor_container template OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits()) { - typedef typename Match::char_type char_type; + //typedef typename Match::char_type char_type; return re_detail::regex_format_imp(i, m, func.begin(), func.end(), f, t); } private: diff --git a/include/boost/regex/v4/regex_split.hpp b/include/boost/regex/v4/regex_split.hpp index a7ae350f..534fb58e 100644 --- a/include/boost/regex/v4/regex_split.hpp +++ b/include/boost/regex/v4/regex_split.hpp @@ -107,7 +107,7 @@ std::size_t regex_split(OutputIterator out, std::size_t max_split) { typedef typename std::basic_string::const_iterator ci_t; - typedef typename match_results::allocator_type match_allocator; + //typedef typename match_results::allocator_type match_allocator; ci_t last = s.begin(); std::size_t init_size = max_split; re_detail::split_pred pred(&last, &out, &max_split); diff --git a/test/regress/test_icu.cpp b/test/regress/test_icu.cpp index feb5b4a4..6392ade7 100644 --- a/test/regress/test_icu.cpp +++ b/test/regress/test_icu.cpp @@ -73,7 +73,7 @@ void compare_result(const MR1& w1, const MR2& w2, boost::mpl::int_<2> const*) typedef typename MR2::value_type MR2_value_type; typedef typename MR2_value_type::const_iterator MR2_iterator_type; typedef boost::u16_to_u32_iterator iterator_type; - typedef typename MR1::size_type size_type; + //typedef typename MR1::size_type size_type; if(w1.size() != w2.size()) { BOOST_REGEX_TEST_ERROR("Size mismatch in match_results class", UChar32); @@ -103,7 +103,7 @@ void compare_result(const MR1& w1, const MR2& w2, boost::mpl::int_<1> const*) typedef typename MR2::value_type MR2_value_type; typedef typename MR2_value_type::const_iterator MR2_iterator_type; typedef boost::u8_to_u32_iterator iterator_type; - typedef typename MR1::size_type size_type; + //typedef typename MR1::size_type size_type; if(w1.size() != w2.size()) { BOOST_REGEX_TEST_ERROR("Size mismatch in match_results class", UChar32); @@ -358,7 +358,7 @@ void test_icu(const wchar_t&, const test_regex_search_tag& ) void test_icu(const wchar_t&, const test_invalid_regex_tag&) { - typedef boost::u16_to_u32_iterator conv_iterator; + //typedef boost::u16_to_u32_iterator conv_iterator; std::vector< ::UChar32> expression; #ifndef BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS expression.assign(test_info::expression().begin(), test_info::expression().end()); diff --git a/test/regress/test_regex_search.hpp b/test/regress/test_regex_search.hpp index 0d87f94c..030a3c1b 100644 --- a/test/regress/test_regex_search.hpp +++ b/test/regress/test_regex_search.hpp @@ -422,7 +422,7 @@ private: template void test_regex_grep(boost::basic_regex& r) { - typedef typename std::basic_string::const_iterator const_iterator; + //typedef typename std::basic_string::const_iterator const_iterator; const std::basic_string& search_text = test_info::search_text(); boost::regex_constants::match_flag_type opts = test_info::match_options(); const int* answer_table = test_info::answer_table();