INTEGRATION: CWS configrefactor01 (1.8.84); FILE MERGED

2007/01/11 10:35:29 mmeeks 1.8.84.2: Submitted by: mmeeks

Large scale re-factoring, remove fine-grained locking in favor of a simple,
single global lock (still in progress).
Identify and fix various hot-spots.
Remove otherwise empty / non-compiled files.
Kill UpdateAccessor
2007/01/08 20:48:55 mmeeks 1.8.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

configmgr/source/inc/mergechange.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: mergechange.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 03:49:58 $
+ *  last change: $Author: ihi $ $Date: 2007-11-23 14:20:18 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -49,13 +49,9 @@
 
 namespace configmgr
 {
-    // -----------------------------------------------------------------------------
-    namespace memory    { class UpdateAccessor; }
-    namespace data      { class NodeAddress; }
-
     // method that applies changes on a existing subtree
-    void applyUpdateWithAdjustment(TreeChangeList & _anUpdate, memory::UpdateAccessor& _aUpdateAccess, data::NodeAddress const & _aBaseAddress);
-    bool adjustUpdate(TreeChangeList & _anUpdate, memory::UpdateAccessor& _aUpdateAccess, data::NodeAddress const & _aBaseAddress);
+    void applyUpdateWithAdjustment(TreeChangeList & _anUpdate, data::NodeAddress const & _aBaseAddress);
+    bool adjustUpdate(TreeChangeList & _anUpdate, data::NodeAddress const & _aBaseAddress);
     void mergeLayer         (TreeChangeList & _aLayer,      ISubtree& _aTree);
     void combineUpdates     (SubtreeChange  const& _anUpdate, SubtreeChange& _aCombinedUpdate);
     void applyLayerUpdate   (TreeChangeList const& _anUpdate, TreeChangeList& _aLayer);