Update of /cvsroot/boost-sandbox/boost-sandbox/boost
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32424
Modified Files:
postconstructible.hpp predestructible.hpp deconstruct_ptr.hpp
Log Message:
Added BOOST_ABI_PREFIX/SUFFIX and made some minor tweaks to
deconstruct_ptr.hpp.
Index: predestructible.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/predestructible.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- predestructible.hpp 3 Mar 2007 16:46:29 -0000 1.3
+++ predestructible.hpp 6 Mar 2007 21:47:07 -0000 1.4
@@ -12,6 +12,10 @@
#ifndef BOOST_PREDESTRUCTIBLE_HEADER
#define BOOST_PREDESTRUCTIBLE_HEADER
+#ifdef BOOST_HAS_ABI_HEADERS
+# include BOOST_ABI_PREFIX
+#endif
+
namespace boost
{
class predestructible
@@ -23,4 +27,9 @@
virtual ~predestructible() {}
};
}
+
+#ifdef BOOST_HAS_ABI_HEADERS
+# include BOOST_ABI_SUFFIX
+#endif
+
#endif
Index: deconstruct_ptr.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/deconstruct_ptr.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- deconstruct_ptr.hpp 23 Feb 2007 14:38:13 -0000 1.4
+++ deconstruct_ptr.hpp 6 Mar 2007 21:47:07 -0000 1.5
@@ -16,6 +16,10 @@
#include <boost/predestructible.hpp>
#include <boost/shared_ptr.hpp>
+#ifdef BOOST_HAS_ABI_HEADERS
+# include BOOST_ABI_PREFIX
+#endif
+
namespace boost
{
namespace deconstruct_detail
@@ -32,16 +36,16 @@
template<typename T> class predestructing_deleter
{
public:
- void operator()(T *ptr)
+ void operator()(const T *ptr) const
{
m_predestruct(ptr);
checked_delete(ptr);
}
private:
- void m_predestruct(...)
+ static void m_predestruct(...)
{
}
- void m_predestruct(const boost::predestructible *ptr)
+ static void m_predestruct(const boost::predestructible *ptr)
{
boost::predestructible *nonconst_ptr = const_cast<boost::predestructible*>(ptr);
nonconst_ptr->predestruct();
@@ -65,4 +69,9 @@
return shared;
}
}
+
+#ifdef BOOST_HAS_ABI_HEADERS
+# include BOOST_ABI_SUFFIX
+#endif
+
#endif
Index: postconstructible.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/postconstructible.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- postconstructible.hpp 7 Feb 2007 18:14:48 -0000 1.2
+++ postconstructible.hpp 6 Mar 2007 21:47:06 -0000 1.3
@@ -12,6 +12,9 @@
#ifndef BOOST_POSTCONSTRUCTIBLE_HEADER
#define BOOST_POSTCONSTRUCTIBLE_HEADER
+#ifdef BOOST_HAS_ABI_HEADERS
+# include BOOST_ABI_PREFIX
+#endif
namespace boost
{
@@ -31,4 +34,9 @@
virtual void postconstruct() {}
};
}
+
+#ifdef BOOST_HAS_ABI_HEADERS
+# include BOOST_ABI_SUFFIX
+#endif
+
#endif
|
