diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-13 15:52:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-13 15:52:34 +0000 |
| commit | cbedb240486a21c5d5676e7a7f4e2ba17a55dbab (patch) | |
| tree | ec2690bb5e5d18df0a9493c54cfac64f9e5ab494 /store/source/object.cxx | |
| parent | 32a3f76b3695cbf54fecc77730395bbace21c8bc (diff) | |
CWS-TOOLING: integrate CWS mhu17
2009-01-23 14:08:09 +0100 mhu r266816 : CWS-TOOLING: rebase CWS mhu17 to trunk@266428 (milestone: DEV300:m39)
2009-01-16 17:49:37 +0100 mhu r266442 : #i98151# Migration to subversion.
2009-01-16 17:48:53 +0100 mhu r266441 : #i98151# Migration to subversion.
2009-01-16 17:47:56 +0100 mhu r266440 : #i98151# Migration to subversion.
Diffstat (limited to 'store/source/object.cxx')
| -rw-r--r-- | store/source/object.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/store/source/object.cxx b/store/source/object.cxx index 92ab83c20097..38bea6a331f3 100644 --- a/store/source/object.cxx +++ b/store/source/object.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_store.hxx" -#define _STORE_OBJECT_CXX_ "$Revision: 1.5 $" -#include <sal/types.h> -#include <rtl/alloc.h> -#include <rtl/ref.hxx> -#include <osl/diagnose.h> -#include <osl/interlck.h> -#include <store/object.hxx> +#include "object.hxx" + +#include "sal/types.h" +#include "rtl/alloc.h" +#include "rtl/ref.hxx" +#include "osl/diagnose.h" +#include "osl/interlck.h" namespace store { @@ -76,7 +76,7 @@ void* OStoreObject::operator new (size_t n) /* * operator delete. */ -void OStoreObject::operator delete (void *p) +void OStoreObject::operator delete (void *p, size_t) { rtl_freeMemory (p); } |