diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:33:52 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:33:52 +0000 |
| commit | d4385eb47a1701260433086f87e96c02ca39023a (patch) | |
| tree | 2b4f70e78c91a3eced66fb614a97ef7140daa370 /vos | |
| parent | 49818ab87693ace2d5b5e235d40b0638d4d8ee36 (diff) | |
INTEGRATION: CWS pj43 (1.4.6); FILE MERGED
2005/12/03 09:23:10 pjanik 1.4.6.1: #i57688#: unsigned int -> size_t (patch from Kendy).
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/source/object.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/vos/source/object.cxx b/vos/source/object.cxx index 4e7945303632..13474b928370 100644 --- a/vos/source/object.cxx +++ b/vos/source/object.cxx @@ -4,9 +4,9 @@ * * $RCSfile: object.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 09:08:09 $ + * last change: $Author: hr $ $Date: 2005-12-28 17:33:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,11 +69,7 @@ OObject::~OObject() { } -#if defined MACOS || defined MACOSX void* OObject::operator new(size_t size) -#else -void* OObject::operator new(unsigned int size) -#endif { void* p = rtl_allocateMemory(size); @@ -82,11 +78,7 @@ void* OObject::operator new(unsigned int size) return (p); } -#if defined MACOS || defined MACOSX void* OObject::operator new(size_t size, void* p) -#else -void* OObject::operator new(unsigned int size, void* p) -#endif { return (p); } @@ -187,8 +179,3 @@ VOS_CLASSINIT::VOS_CLASSINIT(register OClassInfo* pNewClass) pClassRoot->m_pNextClass = pNewClass; } - - - - - |