Remove commented out code in gc_cpp.cc/h

(code refactoring)

* gc_cpp.cc: Remove commented out code.
* include/gc_cpp.h: Likewise.

Conflicts:

    gc_cpp.cc
    include/gc_cpp.h

diff --git a/gc_cpp.cc b/gc_cpp.cc
index 279ccf46f5f058357cc9789816616fb127193d31..5cf305e014a16b78983502ee10656d7aa9a5d442 100644 (file)
--- 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 35b5b63178ef9c537499d702641e95d00150ebee..9f9dcc02759db52cdc25f6add0d132c7401ec2fb 100644 (file)
--- 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 )
     {