Update of /cvsroot/boost/boost/boost
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27039
Modified Files:
Tag: RC_1_34_0
intrusive_ptr.hpp shared_ptr.hpp
Log Message:
Patch #1551992 (Michael Fink)
Index: intrusive_ptr.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive_ptr.hpp,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- intrusive_ptr.hpp 25 Sep 2005 21:26:59 -0000 1.21
+++ intrusive_ptr.hpp 6 Nov 2006 17:25:59 -0000 1.21.2.1
@@ -249,6 +249,9 @@
#else
+// in STLport's no-iostreams mode no iostream symbols can be used
+#ifndef _STLP_NO_IOSTREAMS
+
# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 &&
__SGI_STL_PORT)
// MSVC6 has problems finding std::basic_ostream through the using declaration
in namespace _STL
using std::basic_ostream;
@@ -261,7 +264,9 @@
return os;
}
-#endif
+#endif // _STLP_NO_IOSTREAMS
+
+#endif // __GNUC__ < 3
} // namespace boost
Index: shared_ptr.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/shared_ptr.hpp,v
retrieving revision 1.62.2.3
retrieving revision 1.62.2.4
diff -u -d -r1.62.2.3 -r1.62.2.4
--- shared_ptr.hpp 7 Jul 2006 22:48:20 -0000 1.62.2.3
+++ shared_ptr.hpp 6 Nov 2006 17:25:59 -0000 1.62.2.4
@@ -504,6 +504,9 @@
#else
+// in STLport's no-iostreams mode no iostream symbols can be used
+#ifndef _STLP_NO_IOSTREAMS
+
# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 &&
__SGI_STL_PORT)
// MSVC6 has problems finding std::basic_ostream through the using declaration
in namespace _STL
using std::basic_ostream;
@@ -516,7 +519,9 @@
return os;
}
-#endif
+#endif // _STLP_NO_IOSTREAMS
+
+#endif // __GNUC__ < 3
// get_deleter (experimental)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
