Author: faridz Date: Thu Aug 14 04:47:59 2008 New Revision: 685863 URL: http://svn.apache.org/viewvc?rev=685863&view=rev Log: 2008-08-14 Farid Zaripov <[EMAIL PROTECTED]>
Merged r683995 from branches/4.2.x * include/fstream [_RWSTD_MSVC]: Disable C4231 warning for every extern template explicit instantiation. * include/istream [_RWSTD_MSVC]: Ditto. * include/loc/_messages.h [_RWSTD_MSVC]: Ditto. * include/loc/_money_get.h [_RWSTD_MSVC]: Ditto. * include/loc/_money_put.h [_RWSTD_MSVC]: Ditto. * include/loc/_moneypunct.h [_RWSTD_MSVC]: Ditto. * include/loc/_num_get.h [_RWSTD_MSVC]: Ditto. * include/loc/_num_put.h [_RWSTD_MSVC]: Ditto. * include/loc/_numpunct.h [_RWSTD_MSVC]: Ditto. * include/loc/_punct.h [_RWSTD_MSVC]: Ditto. * include/loc/_time_get.h [_RWSTD_MSVC]: Ditto. * include/loc/_time_put.h [_RWSTD_MSVC]: Ditto. * include/ostream [_RWSTD_MSVC]: Ditto. * include/rw/_basic_ios.h [_RWSTD_MSVC]: Ditto. * include/rw/_ioinsert.h [_RWSTD_MSVC]: Ditto. * include/rw/_stringio.h [_RWSTD_MSVC]: Ditto. * include/sstream [_RWSTD_MSVC]: Ditto. * include/streambuf [_RWSTD_MSVC]: Ditto. * include/string [_RWSTD_MSVC]: Ditto. Modified: stdcxx/trunk/include/fstream stdcxx/trunk/include/istream stdcxx/trunk/include/loc/_messages.h stdcxx/trunk/include/loc/_money_get.h stdcxx/trunk/include/loc/_money_put.h stdcxx/trunk/include/loc/_moneypunct.h stdcxx/trunk/include/loc/_num_get.h stdcxx/trunk/include/loc/_num_put.h stdcxx/trunk/include/loc/_numpunct.h stdcxx/trunk/include/loc/_punct.h stdcxx/trunk/include/loc/_time_get.h stdcxx/trunk/include/loc/_time_put.h stdcxx/trunk/include/ostream stdcxx/trunk/include/rw/_basic_ios.h stdcxx/trunk/include/rw/_ioinsert.h stdcxx/trunk/include/rw/_stringio.h stdcxx/trunk/include/sstream stdcxx/trunk/include/streambuf stdcxx/trunk/include/string Modified: stdcxx/trunk/include/fstream URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/fstream?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/fstream (original) +++ stdcxx/trunk/include/fstream Thu Aug 14 04:47:59 2008 @@ -667,6 +667,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_BASIC_FILEBUF) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_BASIC_FILEBUF, _CHAR) @@ -687,6 +693,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_FILEBUF) # include <fstream.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_FILEBUF) Modified: stdcxx/trunk/include/istream URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/istream?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/istream (original) +++ stdcxx/trunk/include/istream Thu Aug 14 04:47:59 2008 @@ -592,6 +592,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_BASIC_ISTREAM) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_BASIC_ISTREAM, _CHAR) @@ -611,6 +617,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_ISTREAM) # include <istream.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_ISTREAM) Modified: stdcxx/trunk/include/loc/_messages.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_messages.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_messages.h (original) +++ stdcxx/trunk/include/loc/_messages.h Thu Aug 14 04:47:59 2008 @@ -149,6 +149,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (MESSAGES) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_MESSAGES, _CHAR) @@ -166,6 +172,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_MESSAGES) # include <loc/_messages.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (MESSAGES) Modified: stdcxx/trunk/include/loc/_money_get.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_money_get.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_money_get.h (original) +++ stdcxx/trunk/include/loc/_money_get.h Thu Aug 14 04:47:59 2008 @@ -130,6 +130,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_MONEY_GET) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_MONEY_GET, _CHAR) @@ -147,6 +153,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_MONEY_GET) # include <loc/_money_get.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_MONEY_GET) Modified: stdcxx/trunk/include/loc/_money_put.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_money_put.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_money_put.h (original) +++ stdcxx/trunk/include/loc/_money_put.h Thu Aug 14 04:47:59 2008 @@ -118,6 +118,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_MONEY_PUT) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_MONEY_PUT, _CHAR) @@ -135,6 +141,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_MONEY_PUT) # include <loc/_money_put.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_MONEY_PUT) Modified: stdcxx/trunk/include/loc/_moneypunct.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_moneypunct.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_moneypunct.h (original) +++ stdcxx/trunk/include/loc/_moneypunct.h Thu Aug 14 04:47:59 2008 @@ -226,6 +226,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_MONEYPUNCT) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_MONEYPUNCT, _CHAR) @@ -245,6 +251,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_MONEYPUNCT) # include <loc/_moneypunct.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_MONEYPUNCT) Modified: stdcxx/trunk/include/loc/_num_get.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_num_get.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_num_get.h (original) +++ stdcxx/trunk/include/loc/_num_get.h Thu Aug 14 04:47:59 2008 @@ -353,6 +353,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_NUM_GET) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_NUM_GET, _CHAR) @@ -370,6 +376,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_NUM_GET) # include <loc/_num_get.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_NUM_GET) Modified: stdcxx/trunk/include/loc/_num_put.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_num_put.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_num_put.h (original) +++ stdcxx/trunk/include/loc/_num_put.h Thu Aug 14 04:47:59 2008 @@ -214,6 +214,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_NUM_PUT) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_NUM_PUT, _CHAR) @@ -231,6 +237,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_NUM_PUT) # include <loc/_num_put.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_NUM_PUT) Modified: stdcxx/trunk/include/loc/_numpunct.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_numpunct.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_numpunct.h (original) +++ stdcxx/trunk/include/loc/_numpunct.h Thu Aug 14 04:47:59 2008 @@ -250,6 +250,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_NUMPUNCT) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_NUMPUNCT, _CHAR) @@ -267,6 +273,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_NUMPUNCT) # include <loc/_numpunct.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_NUMPUNCT) Modified: stdcxx/trunk/include/loc/_punct.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_punct.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_punct.h (original) +++ stdcxx/trunk/include/loc/_punct.h Thu Aug 14 04:47:59 2008 @@ -130,6 +130,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_PUNCT) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (__rw) { #define _RWSTD_ARG_LIST(charT) \ @@ -156,6 +162,11 @@ } // namespace __rw +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_PUNCT) # include <loc/_punct.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_PUNCT) Modified: stdcxx/trunk/include/loc/_time_get.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_time_get.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_time_get.h (original) +++ stdcxx/trunk/include/loc/_time_get.h Thu Aug 14 04:47:59 2008 @@ -221,6 +221,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_TIME_GET) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_TIME_GET, _CHAR) @@ -238,6 +244,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_TIME_GET) # include <loc/_time_get.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_TIME_GET) Modified: stdcxx/trunk/include/loc/_time_put.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/loc/_time_put.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/loc/_time_put.h (original) +++ stdcxx/trunk/include/loc/_time_put.h Thu Aug 14 04:47:59 2008 @@ -120,6 +120,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_TIME_PUT) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_TIME_PUT, _CHAR) @@ -137,6 +143,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_TIME_PUT) # include <loc/_time_put.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_TIME_PUT) Modified: stdcxx/trunk/include/ostream URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/ostream?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/ostream (original) +++ stdcxx/trunk/include/ostream Thu Aug 14 04:47:59 2008 @@ -555,6 +555,12 @@ // - warning C4660: template-class specialization is already instantiated // - many linker errors for (inline or otherwise) members of basic_ostream +# ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +# endif // _RWSTD_MSVC + + # if _RWSTD_INSTANTIATE (_BASIC_OSTREAM, _CHAR) _RWSTD_INSTANTIATE_2 (class _RWSTD_TI_EXPORT @@ -568,6 +574,12 @@ basic_ostream<wchar_t, char_traits<wchar_t> >); # endif // _RWSTD_INSTANTIATE (_BASIC_OSTREAM, _WCHAR_T) + + +# ifdef _RWSTD_MSVC +# pragma warning (pop) +# endif // _RWSTD_MSVC + #endif // !_MSC_VER || _MSC_VER >= 1310 } // namespace std Modified: stdcxx/trunk/include/rw/_basic_ios.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_basic_ios.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/rw/_basic_ios.h (original) +++ stdcxx/trunk/include/rw/_basic_ios.h Thu Aug 14 04:47:59 2008 @@ -340,6 +340,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_BASIC_IOS) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_BASIC_IOS, _CHAR) @@ -359,6 +365,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_IOS) # include <rw/_basic_ios.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_IOS) Modified: stdcxx/trunk/include/rw/_ioinsert.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_ioinsert.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/rw/_ioinsert.h (original) +++ stdcxx/trunk/include/rw/_ioinsert.h Thu Aug 14 04:47:59 2008 @@ -99,6 +99,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_INSERTER) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (__rw) { @@ -218,6 +224,11 @@ } // namespace __rw +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_INSERTER) # include <rw/_ioinsert.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_INSERTER) Modified: stdcxx/trunk/include/rw/_stringio.h URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_stringio.h?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/rw/_stringio.h (original) +++ stdcxx/trunk/include/rw/_stringio.h Thu Aug 14 04:47:59 2008 @@ -117,6 +117,12 @@ # endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_BASIC_ISTREAM) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_BASIC_ISTREAM, _CHAR) @@ -141,6 +147,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + # if _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_ISTREAM) # include <rw/_stringio.cc> # endif // _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_ISTREAM) Modified: stdcxx/trunk/include/sstream URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/sstream?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/sstream (original) +++ stdcxx/trunk/include/sstream Thu Aug 14 04:47:59 2008 @@ -440,6 +440,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_BASIC_STRINGBUF) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_BASIC_STRINGBUF, _CHAR) @@ -457,6 +463,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_STRINGBUF) # include <sstream.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_STRINGBUF) Modified: stdcxx/trunk/include/streambuf URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/streambuf?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/streambuf (original) +++ stdcxx/trunk/include/streambuf Thu Aug 14 04:47:59 2008 @@ -531,6 +531,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_BASIC_STREAMBUF) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_BASIC_STREAMBUF, _CHAR) @@ -548,6 +554,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_STREAMBUF) # include <streambuf.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_STREAMBUF) Modified: stdcxx/trunk/include/string URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/string?rev=685863&r1=685862&r2=685863&view=diff ============================================================================== --- stdcxx/trunk/include/string (original) +++ stdcxx/trunk/include/string Thu Aug 14 04:47:59 2008 @@ -1553,6 +1553,12 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_BASIC_STRING) +#ifdef _RWSTD_MSVC +# pragma warning (push) +# pragma warning (disable: 4231) +#endif // _RWSTD_MSVC + + _RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_BASIC_STRING, _CHAR) @@ -1574,6 +1580,11 @@ } // namespace std +#ifdef _RWSTD_MSVC +# pragma warning (pop) +#endif // _RWSTD_MSVC + + #if _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_STRING) # include <string.cc> #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_STRING)