summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gc_cpp.cc42
-rw-r--r--include/gc_cpp.h7
2 files changed, 1 insertions, 48 deletions
diff --git a/gc_cpp.cc b/gc_cpp.cc
index 279ccf46..5cf305e0 100644
--- a/gc_cpp.cc
+++ b/gc_cpp.cc
@@ -42,45 +42,3 @@ built-in "new" and "delete".
# define GC_DECL_NEW_THROW /* empty */
# define GC_DECL_DELETE_THROW /* empty */
#endif /* !GC_NEW_DELETE_NEED_THROW */
-
-// MOVED TO HEADER!
-//void* operator new( size_t size ) {
-// return GC_MALLOC_UNCOLLECTABLE( size );}
-//
-//void operator delete( void* obj ) {
-// GC_FREE( obj );}
-//
-//#ifdef GC_OPERATOR_NEW_ARRAY
-//
-//void* operator new[]( size_t size ) {
-// return GC_MALLOC_UNCOLLECTABLE( size );}
-//
-//void operator delete[]( void* obj ) {
-// GC_FREE( obj );}
-//
-//#endif /* GC_OPERATOR_NEW_ARRAY */
-//
-//#ifdef _MSC_VER
-//
-//// This new operator is used by VC++ in case of Debug builds !
-//void* operator new( size_t size,
-// int ,//nBlockUse,
-// const char * szFileName,
-// int nLine )
-//{
-//#ifndef GC_DEBUG
-// return GC_malloc_uncollectable( size );
-//#else
-// return GC_debug_malloc_uncollectable(size, szFileName, nLine);
-//#endif
-//}
-//
-//#if _MSC_VER > 1020
-//// This new operator is used by VC++ 7.0 and later in Debug builds.
-//void* operator new[](size_t size, int nBlockUse, const char* szFileName, int nLine)
-//{
-// return operator new(size, nBlockUse, szFileName, nLine);
-//}
-//#endif
-//
-//#endif /* _MSC_VER */
diff --git a/include/gc_cpp.h b/include/gc_cpp.h
index 35b5b631..9f9dcc02 100644
--- a/include/gc_cpp.h
+++ b/include/gc_cpp.h
@@ -287,11 +287,6 @@ inline void operator delete[]( void* obj ) {
#endif
-
-// void* operator new( size_t size);
-// void operator delete(void* obj);
-
- // MOVED HERE FROM gc_hpp.cc!
inline void* operator new(size_t size)
{
return GC_MALLOC_UNCOLLECTABLE(size);
@@ -305,7 +300,7 @@ inline void operator delete[]( void* obj ) {
// This new operator is used by VC++ in case of Debug builds !
inline void* operator new( size_t size,
- int ,//nBlockUse,
+ int /* nBlockUse */,
const char * szFileName,
int nLine )
{