Update of /cvsroot/boost/boost/boost
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3878
Modified Files:
shared_ptr.hpp
Log Message:
_MANAGED fix for sp_enable_shared_from_this
Index: shared_ptr.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/shared_ptr.hpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- shared_ptr.hpp 9 Apr 2007 16:32:45 -0000 1.68
+++ shared_ptr.hpp 9 Apr 2007 16:37:30 -0000 1.69
@@ -88,6 +88,21 @@
if(pe != 0) pe->_internal_weak_this._internal_assign(const_cast<Y*>(px),
pn);
}
+#ifdef _MANAGED
+
+// Avoid C4793, ... causes native code generation
+
+struct sp_any_pointer
+{
+ template<class T> sp_any_pointer( T* ) {}
+};
+
+inline void sp_enable_shared_from_this( shared_count const & /*pn*/,
sp_any_pointer, sp_any_pointer )
+{
+}
+
+#else // _MANAGED
+
#ifdef sgi
// Turn off: the last argument of the varargs function
"sp_enable_shared_from_this" is unnamed
# pragma set woff 3506
@@ -101,6 +116,8 @@
# pragma reset woff 3506
#endif
+#endif // _MANAGED
+
#if !defined( BOOST_NO_SFINAE ) && !defined(
BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( BOOST_NO_AUTO_PTR )
// rvalue auto_ptr support based on a technique by Dave Abrahams
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
