Author: faridz Date: Mon Feb 20 07:51:49 2012 New Revision: 1291142 URL: http://svn.apache.org/viewvc?rev=1291142&view=rev Log: 2012-02-20 Farid Zaripov <far...@apache.com>
* tests/regress/21.string.append.stdcxx-1060.cpp: Resolve declaration conflict on Sun compiler. Modified: stdcxx/branches/4.2.x/tests/regress/21.string.append.stdcxx-1060.cpp Modified: stdcxx/branches/4.2.x/tests/regress/21.string.append.stdcxx-1060.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/regress/21.string.append.stdcxx-1060.cpp?rev=1291142&r1=1291141&r2=1291142&view=diff ============================================================================== --- stdcxx/branches/4.2.x/tests/regress/21.string.append.stdcxx-1060.cpp (original) +++ stdcxx/branches/4.2.x/tests/regress/21.string.append.stdcxx-1060.cpp Mon Feb 20 07:51:49 2012 @@ -39,19 +39,21 @@ struct my_traits : std::char_traits<ch> using std::char_traits<ch>::pos_type; using std::char_traits<ch>::eof; - using std::char_traits<ch>::assign; using std::char_traits<ch>::eq; using std::char_traits<ch>::lt; using std::char_traits<ch>::compare; using std::char_traits<ch>::find; using std::char_traits<ch>::length; using std::char_traits<ch>::move; - using std::char_traits<ch>::copy; using std::char_traits<ch>::eq_int_type; using std::char_traits<ch>::not_eof; using std::char_traits<ch>::to_char_type; using std::char_traits<ch>::to_int_type; + static void assign (ch& c1, const ch& c2) { + std::char_traits<ch>::assign (c1, c2); + } + static ch* copy (ch* dst, const ch* src, std::size_t n); static ch* assign (ch* s, std::size_t n, ch c); };