Kaydet (Commit) a8d4ff5a authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

INTEGRATION: CWS configrefactor01 (1.12.84); FILE MERGED

2007/02/07 12:14:54 mmeeks 1.12.84.3: remove obsolete memory::Segment forward decls.
2007/01/16 12:18:21 mmeeks 1.12.84.2: Submitted by: mmeeks
Kill 'memory::Segment' - no longer needed.
Bin some other (empty / redundant) headers.
2007/01/12 14:50:44 mmeeks 1.12.84.1: Another big prune of memory::Accessor ...
üst 9aa75022
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: roottree.hxx,v $ * $RCSfile: roottree.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 03:54:35 $ * last change: $Author: ihi $ $Date: 2007-11-23 14:23:34 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -53,13 +53,6 @@ namespace configmgr ...@@ -53,13 +53,6 @@ namespace configmgr
struct TreeChangeList; struct TreeChangeList;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
namespace memory
{
class Segment;
class Accessor;
}
//-----------------------------------------------------------------------------
namespace data namespace data
{ {
class NodeAccess; class NodeAccess;
...@@ -82,13 +75,11 @@ namespace configmgr ...@@ -82,13 +75,11 @@ namespace configmgr
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
RootTree createReadOnlyTree( AbsolutePath const& aRootPath, RootTree createReadOnlyTree( AbsolutePath const& aRootPath,
memory::Segment const* _pDataSegment,
data::NodeAccess const& _aCacheNode, data::NodeAccess const& _aCacheNode,
TreeDepth nDepth, TreeDepth nDepth,
TemplateProvider const& aTemplateProvider); TemplateProvider const& aTemplateProvider);
RootTree createUpdatableTree( AbsolutePath const& aRootPath, RootTree createUpdatableTree( AbsolutePath const& aRootPath,
memory::Segment const* _pDataSegment,
data::NodeAccess const& _aCacheNode, data::NodeAccess const& _aCacheNode,
TreeDepth nDepth, TreeDepth nDepth,
TemplateProvider const& aTemplateProvider); TemplateProvider const& aTemplateProvider);
...@@ -105,14 +96,14 @@ namespace configmgr ...@@ -105,14 +96,14 @@ namespace configmgr
~CommitHelper(); ~CommitHelper();
// collect all changes into rChangeList // collect all changes into rChangeList
bool prepareCommit(memory::Accessor const & _aAccessor, TreeChangeList& rChangeList); bool prepareCommit(TreeChangeList& rChangeList);
// finish and clean up the changes in rChangeList after they are integrated // finish and clean up the changes in rChangeList after they are integrated
void finishCommit(memory::Accessor const & _aAccessor, TreeChangeList& rChangeList); void finishCommit(TreeChangeList& rChangeList);
// restore the changes in rChangeList as pending // restore the changes in rChangeList as pending
void revertCommit(memory::Accessor const & _aAccessor, TreeChangeList& rChangeList); void revertCommit(TreeChangeList& rChangeList);
// throw away and clean up the changes in rChangeList after a commit failed // throw away and clean up the changes in rChangeList after a commit failed
void failedCommit(memory::Accessor const & _aAccessor, TreeChangeList& rChangeList); void failedCommit(TreeChangeList& rChangeList);
// dispose of auxiliary data for a commit operation // dispose of auxiliary data for a commit operation
void reset(); void reset();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment