mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added default new operators to the F_Object class - ones without file and line number.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@633 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
dsandersoremutah
2006-07-05 14:42:47 +00:00
parent 45a68cbae2
commit d60f9efd0c
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ftk/src/ftk.h
View File

@@ -861,6 +861,14 @@
throw()
#endif
;
/// Overloaded new operator for objects of this class.
void * FLMAPI operator new(
FLMSIZET uiSize) ///< Number of bytes to allocate - should be sizeof( ThisClass).
#ifndef FLM_WATCOM_NLM
throw()
#endif
;
/// Overloaded new operator (array) for objects of this class (with source file and line number).
/// This new operator is called when an array of objects of this class are allocated.
@@ -875,6 +883,15 @@
#endif
;
/// Overloaded new operator (array) for objects of this class.
/// This new operator is called when an array of objects of this class are allocated.
void * FLMAPI operator new[](
FLMSIZET uiSize) ///< Number of bytes to allocate - should be sizeof( ThisClass).
#ifndef FLM_WATCOM_NLM
throw()
#endif
;
/// Overloaded delete operator for objects of this class.
void FLMAPI operator delete(
void * ptr); ///< Pointer to object being freed.

30
ftk/src/ftkmem.cpp
View File

@@ -5598,6 +5598,21 @@ void * F_Object::operator new(
return( pvReturnPtr);
}
/****************************************************************************
Desc:
****************************************************************************/
void * F_Object::operator new(
FLMSIZET uiSize)
#ifndef FLM_WATCOM_NLM
throw()
#endif
{
void * pvReturnPtr = NULL;
f_allocImp( uiSize, &pvReturnPtr, TRUE, NULL, 0);
return( pvReturnPtr);
}
/****************************************************************************
Desc:
****************************************************************************/
@@ -5615,6 +5630,21 @@ void * F_Object::operator new[](
return( pvReturnPtr);
}
/****************************************************************************
Desc:
****************************************************************************/
void * F_Object::operator new[](
FLMSIZET uiSize)
#ifndef FLM_WATCOM_NLM
throw()
#endif
{
void * pvReturnPtr = NULL;
f_allocImp( uiSize, &pvReturnPtr, TRUE, NULL, 0);
return( pvReturnPtr);
}
/****************************************************************************
Desc:
****************************************************************************/