You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2008/08/08 17:11:31 UTC
svn commit: r683995 - in /stdcxx/branches/4.2.x/include: ./ loc/ rw/
Author: faridz
Date: Fri Aug 8 08:11:30 2008
New Revision: 683995
URL: http://svn.apache.org/viewvc?rev=683995&view=rev
Log:
2008-08-08 Farid Zaripov <fa...@apache.com>
* 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/branches/4.2.x/include/fstream
stdcxx/branches/4.2.x/include/istream
stdcxx/branches/4.2.x/include/loc/_messages.h
stdcxx/branches/4.2.x/include/loc/_money_get.h
stdcxx/branches/4.2.x/include/loc/_money_put.h
stdcxx/branches/4.2.x/include/loc/_moneypunct.h
stdcxx/branches/4.2.x/include/loc/_num_get.h
stdcxx/branches/4.2.x/include/loc/_num_put.h
stdcxx/branches/4.2.x/include/loc/_numpunct.h
stdcxx/branches/4.2.x/include/loc/_punct.h
stdcxx/branches/4.2.x/include/loc/_time_get.h
stdcxx/branches/4.2.x/include/loc/_time_put.h
stdcxx/branches/4.2.x/include/ostream
stdcxx/branches/4.2.x/include/rw/_basic_ios.h
stdcxx/branches/4.2.x/include/rw/_ioinsert.h
stdcxx/branches/4.2.x/include/rw/_stringio.h
stdcxx/branches/4.2.x/include/sstream
stdcxx/branches/4.2.x/include/streambuf
stdcxx/branches/4.2.x/include/string
Modified: stdcxx/branches/4.2.x/include/fstream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/fstream?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/fstream (original)
+++ stdcxx/branches/4.2.x/include/fstream Fri Aug 8 08:11:30 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/branches/4.2.x/include/istream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/istream?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/istream (original)
+++ stdcxx/branches/4.2.x/include/istream Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_messages.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_messages.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_messages.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_messages.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_money_get.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_money_get.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_money_get.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_money_get.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_money_put.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_money_put.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_money_put.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_money_put.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_moneypunct.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_moneypunct.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_moneypunct.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_moneypunct.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_num_get.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_num_get.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_num_get.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_num_get.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_num_put.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_num_put.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_num_put.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_num_put.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_numpunct.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_numpunct.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_numpunct.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_numpunct.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_punct.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_punct.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_punct.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_punct.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_time_get.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_time_get.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_time_get.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_time_get.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/loc/_time_put.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/loc/_time_put.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/loc/_time_put.h (original)
+++ stdcxx/branches/4.2.x/include/loc/_time_put.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/ostream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/ostream?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/ostream (original)
+++ stdcxx/branches/4.2.x/include/ostream Fri Aug 8 08:11:30 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/branches/4.2.x/include/rw/_basic_ios.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_basic_ios.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_basic_ios.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_basic_ios.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/rw/_ioinsert.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_ioinsert.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_ioinsert.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_ioinsert.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/rw/_stringio.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_stringio.h?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_stringio.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_stringio.h Fri Aug 8 08:11:30 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/branches/4.2.x/include/sstream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/sstream?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/sstream (original)
+++ stdcxx/branches/4.2.x/include/sstream Fri Aug 8 08:11:30 2008
@@ -461,6 +461,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)
@@ -478,6 +484,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/branches/4.2.x/include/streambuf
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/streambuf?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/streambuf (original)
+++ stdcxx/branches/4.2.x/include/streambuf Fri Aug 8 08:11:30 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/branches/4.2.x/include/string
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/string?rev=683995&r1=683994&r2=683995&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/string (original)
+++ stdcxx/branches/4.2.x/include/string Fri Aug 8 08:11:30 2008
@@ -1609,6 +1609,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)
@@ -1630,6 +1636,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)