diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:33:29 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:33:29 +0000 |
| commit | 49818ab87693ace2d5b5e235d40b0638d4d8ee36 (patch) | |
| tree | 2e70aff376eaaabf2919b12389dec363d4b2a4cb /vos | |
| parent | 523c4d7510d4dc21ac1659ca8b240f069163ac7b (diff) | |
INTEGRATION: CWS pj43 (1.3.8); FILE MERGED
2005/12/03 09:22:29 pjanik 1.3.8.1: #i57688#: unsigned int -> size_t (patch from Kendy).
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/inc/vos/object.hxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx index 822f5e8a743c..5cdb2963bbe3 100644 --- a/vos/inc/vos/object.hxx +++ b/vos/inc/vos/object.hxx @@ -4,9 +4,9 @@ * * $RCSfile: object.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-09 09:01:02 $ + * last change: $Author: hr $ $Date: 2005-12-28 17:33:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -84,13 +84,8 @@ public: /** Define private new and delete operator because of compiler bug, when allocating and deleteing a exported class */ -#if defined MACOS || defined MACOSX || defined NETBSD void* SAL_CALL operator new(size_t size); void* SAL_CALL operator new(size_t size, void* p); -#else - void* SAL_CALL operator new(unsigned int size); - void* SAL_CALL operator new(unsigned int size, void* p); -#endif void SAL_CALL operator delete(void* p); |