diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:16:19 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:16:19 +0000 |
| commit | 52d114afe1d0fa1b0eb84efa4f1bdc2d0ee824de (patch) | |
| tree | 76c2a41d59ba2f8a3bcc2e92af8e73a8b7d7c62f /configmgr/source/inc | |
| parent | 6ea0d1e3976822522eeace96c03fc766a1b0b05c (diff) | |
INTEGRATION: CWS configrefactor01 (1.5.84); FILE MERGED
2007/01/16 12:18:20 mmeeks 1.5.84.3: Submitted by: mmeeks
Kill 'memory::Segment' - no longer needed.
Bin some other (empty / redundant) headers.
2007/01/11 20:16:00 mmeeks 1.5.84.2: Submitted by: mmeeks
More re-factoring, lots of locking rationalized, drastically reduced
the mutex count, also removed ~300k interlocked increments with a non-interlocking
SimpleReferencedObject base
2007/01/08 20:48:54 mmeeks 1.5.84.1: Issue number:
Submitted by: mmeeks
Substantial configmgr re-factoring #1 ...
+ remove endless typedef chains
+ remove custom allocator & associated complexity
+ remove Pointer, and 'Address' classes
Diffstat (limited to 'configmgr/source/inc')
| -rw-r--r-- | configmgr/source/inc/cacheddataprovider.hxx | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/configmgr/source/inc/cacheddataprovider.hxx b/configmgr/source/inc/cacheddataprovider.hxx index c736a53f1737..a7f76024a61f 100644 --- a/configmgr/source/inc/cacheddataprovider.hxx +++ b/configmgr/source/inc/cacheddataprovider.hxx @@ -4,9 +4,9 @@ * * $RCSfile: cacheddataprovider.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 03:43:49 $ + * last change: $Author: ihi $ $Date: 2007-11-23 14:16:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,15 +45,11 @@ #ifndef CONFIGMGR_BACKEND_REQUESTTYPES_HXX_ #include "requesttypes.hxx" #endif -#ifndef CONFIGMGR_SEGMENT_HXX -#include "segment.hxx" -#endif #ifndef CONFIGMGR_UTILITY_HXX_ #include "utility.hxx" #endif - -#ifndef _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_ -#include <salhelper/simplereferenceobject.hxx> +#ifndef INCLUDED_SHARABLE_TREEFRAGMENT_HXX +#include "treefragment.hxx" #endif #ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> @@ -65,13 +61,7 @@ namespace configmgr namespace backend { // --------------------------------------------------------------------------- - struct CacheLocation - { - memory::SegmentAddress segment; - memory::SegmentHeap::Address address; - - bool isNull() const { return segment.isNull() || address == 0; } - }; + typedef data::TreeAddress CacheLocation; // --------------------------------------------------------------------------- struct IDirectDataProvider; struct ICachedDataNotifier; |