20022N/A--- ptlib-2.6.7/src/ptlib/common/object.cxx.orig 2011-01-28 10:22:49.734324998 +0800
20022N/A+++ ptlib-2.6.7/src/ptlib/common/object.cxx 2011-01-28 11:01:21.888191316 +0800
20022N/A@@ -243,7 +243,7 @@
20022N/A #undef realloc
20022N/A #undef free
20022N/A
20022N/A-#if (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A+#if (__SUNPRO_CC == 0x5110) || (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A void * operator new(size_t nSize) throw (std::bad_alloc)
20022N/A #else
20022N/A void * operator new(size_t nSize)
20022N/A@@ -253,7 +253,7 @@
20022N/A }
20022N/A
20022N/A
20022N/A-#if (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A+#if (__SUNPRO_CC == 0x5110) || (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A void * operator new[](size_t nSize) throw (std::bad_alloc)
20022N/A #else
20022N/A void * operator new[](size_t nSize)
20022N/A@@ -263,7 +263,7 @@
20022N/A }
20022N/A
20022N/A
20022N/A-#if (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A+#if (__SUNPRO_CC == 0x5110) || (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A void operator delete(void * ptr) throw()
20022N/A #else
20022N/A void operator delete(void * ptr)
20022N/A@@ -273,7 +273,7 @@
20022N/A }
20022N/A
20022N/A
20022N/A-#if (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A+#if (__SUNPRO_CC == 0x5110) || (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A void operator delete[](void * ptr) throw()
20022N/A #else
20022N/A void operator delete[](void * ptr)
20022N/A@@ -937,7 +937,7 @@
20022N/A
20022N/A #if !defined(P_VXWORKS) && !defined(_WIN32_WCE)
20022N/A
20022N/A-#if (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A+#if (__SUNPRO_CC == 0x5110) || (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A void * operator new[](size_t nSize) throw (std::bad_alloc)
20022N/A #else
20022N/A void * operator new[](size_t nSize)
20022N/A@@ -946,7 +946,7 @@
20022N/A return malloc(nSize);
20022N/A }
20022N/A
20022N/A-#if (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A+#if (__SUNPRO_CC == 0x5110) || (__GNUC__ >= 3) || ((__GNUC__ == 2)&&(__GNUC_MINOR__ >= 95)) //2.95.X & 3.X
20022N/A void operator delete[](void * ptr) throw ()
20022N/A #else
20022N/A void operator delete[](void * ptr)