Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / common / stdstream.cpp

diff --git a/src/common/stdstream.cpp b/src/common/stdstream.cpp
index cec1fc925f413942b6c6cccd68484a6f99cade35..0f4fea1836da9cdff9e8174e6648f571d50eb896 100644 (file)
--- a/src/common/stdstream.cpp
+++ b/src/common/stdstream.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/stdstream.h
+// Name:        src/common/stdstream.cpp

 // Purpose:     Implementation of std::istream and std::ostream derived
 //              wrappers for wxInputStream and wxOutputStream
 // Author:      Jonathan Liu <net147@gmail.com>
 // Purpose:     Implementation of std::istream and std::ostream derived
 //              wrappers for wxInputStream and wxOutputStream
 // Author:      Jonathan Liu <net147@gmail.com>


@@ -20,7 +20,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_STD_IOSTREAM
+#if wxUSE_STREAMS && wxUSE_STD_IOSTREAM

 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif


@@ -290,4 +290,4 @@ wxStdOutputStream::wxStdOutputStream(wxOutputStream& stream) :
 
 #endif // VC6/!VC6
 
 
 #endif // VC6/!VC6
 

-#endif // wxUSE_STD_IOSTREAM
+#endif // wxUSE_STREAMS && wxUSE_STD_IOSTREAM