INTEGRATION: CWS cfg01 (1.2.24); FILE MERGED

2003/03/13 15:33:07 jb 1.2.24.1: #108154# Use NodeAccessRef to avoid copying Accessor objects

configmgr/source/inc/nodevisitor.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: nodevisitor.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jb $ $Date: 2002-02-15 14:34:34 $
+ *  last change: $Author: vg $ $Date: 2003-04-01 13:34:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,7 @@ namespace configmgr
     namespace data
     {
     // -------------------------------------------------------------------------
-        class NodeAccess;
+        class NodeAccessRef;
             class ValueNodeAccess;
             class GroupNodeAccess;
             class SetNodeAccess;
@@ -91,11 +91,11 @@ namespace configmgr
             Result visitChildren(GroupNodeAccess const& _aNode);
 
             /// dispatch to <var>aNode</var> as the proper type
-            Result visitNode(NodeAccess const& _aNode);
+            Result visitNode(NodeAccessRef const& _aNode);
 
         protected:
             /// do the operation on <var>aNode</var>. Default implementation returns CONTINUE.
-            virtual Result handle(NodeAccess const& _aNode);
+            virtual Result handle(NodeAccessRef const& _aNode);
 
             /// do the operation on <var>aNode</var>. Default implementation calls handle(NodeAccess(_aNode));
             virtual Result handle(ValueNodeAccess const& _aNode);

configmgr/source/inc/treeaccessor.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: treeaccessor.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jb $ $Date: 2002-03-28 08:47:03 $
+ *  last change: $Author: vg $ $Date: 2003-04-01 13:34:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -122,10 +122,10 @@ namespace configmgr
             Attributes getAttributes() const { return data().getAttributes(); }
             Name getName() const;
 
-            NodeAccess getRootNode() const { return NodeAccess(m_aAccessor,rootAddress(m_pBase)); }
+            NodeAccessRef getRootNode() const { return NodeAccessRef(&m_aAccessor,rootAddress(m_pBase)); }
 
             DataAddressType address() const { return m_pBase; }
-            Accessor        accessor() const { return m_aAccessor; }
+            Accessor const& accessor() const { return m_aAccessor; }
 
             DataType& data() const { return *static_cast<DataPointerType>(m_aAccessor.validate(m_pBase.m_pData)); }
             DataPointerType getDataPtr() const { return access(m_pBase,m_aAccessor); }