Author: vitek Date: Thu Aug 7 14:42:40 2008 New Revision: 683728 URL: http://svn.apache.org/viewvc?rev=683728&view=rev Log: 2008-08-07 Travis Vitek <[EMAIL PROTECTED]>
Merge r683727 from branches/4.2.x: 2008-08-07 Travis Vitek <[EMAIL PROTECTED]> * src/collate.cpp (__rw_hash): Add throw spec to make explicit instantiation request consistent with template declaration and resolve compile failures. Modified: stdcxx/branches/4.3.x/src/collate.cpp Modified: stdcxx/branches/4.3.x/src/collate.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/src/collate.cpp?rev=683728&r1=683727&r2=683728&view=diff ============================================================================== --- stdcxx/branches/4.3.x/src/collate.cpp (original) +++ stdcxx/branches/4.3.x/src/collate.cpp Thu Aug 7 14:42:40 2008 @@ -822,11 +822,11 @@ // templates even of they are completely defined in .cpp files // (e.g., Compaq C++) -template long __rw_hash (const char*, const char*); +template long __rw_hash (const char*, const char*) _THROWS(()); # ifndef _RWSTD_NO_WCHAR_T -template long __rw_hash (const wchar_t*, const wchar_t*); +template long __rw_hash (const wchar_t*, const wchar_t*) _THROWS(()); # endif // _RWSTD_NO_WCHAR_T