summaryrefslogtreecommitdiff
path: root/src/cstore/unionfs/cstore-unionfs.hpp
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-09-08 08:24:09 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-09-08 08:24:09 -0700
commit134f35f838d444d63a1774b986380264e7089c6e (patch)
treef720a657594a52bdb611dabef15b85ae531ffce5 /src/cstore/unionfs/cstore-unionfs.hpp
parentb1c8827efedc245d47f89cf8b4db30f495498ae7 (diff)
parent5a4ac0f6fc5fa0a25663f7834fef4cbd5ba98ecd (diff)
downloadvyatta-cfg-134f35f838d444d63a1774b986380264e7089c6e.tar.gz
vyatta-cfg-134f35f838d444d63a1774b986380264e7089c6e.zip
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg into mendocino
Diffstat (limited to 'src/cstore/unionfs/cstore-unionfs.hpp')
-rw-r--r--src/cstore/unionfs/cstore-unionfs.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cstore/unionfs/cstore-unionfs.hpp b/src/cstore/unionfs/cstore-unionfs.hpp
index bff4844..3942e01 100644
--- a/src/cstore/unionfs/cstore-unionfs.hpp
+++ b/src/cstore/unionfs/cstore-unionfs.hpp
@@ -83,7 +83,7 @@ private:
// path buffers
b_fs::path mutable_cfg_path; // mutable part of config path
b_fs::path tmpl_path; // whole template path
- map<const void *, pair<b_fs::path, b_fs::path> > saved_paths;
+ Cstore::MapT<const void *, pair<b_fs::path, b_fs::path> > saved_paths;
// saved mutable part of cfg path and whole template path
////// virtual functions defined in base class
@@ -122,7 +122,7 @@ private:
saved_paths[handle] = p;
};
void restore_paths(const void *handle = NULL) {
- map<const void *, pair<b_fs::path, b_fs::path> >::iterator it
+ Cstore::MapT<const void *, pair<b_fs::path, b_fs::path> >::iterator it
= saved_paths.find(handle);
if (it == saved_paths.end()) {
exit_internal("restore_paths: handle not found\n");
@@ -158,14 +158,14 @@ private:
bool mark_deactivated();
bool unmark_deactivated();
bool unmark_deactivated_descendants();
+ bool mark_changed_with_ancestors();
bool unmark_changed_with_descendants();
- bool mark_changed();
bool remove_comment();
bool set_comment(const string& comment);
bool discard_changes(unsigned long long& num_removed);
// observers for work path
- bool marked_changed();
+ bool cfg_node_changed();
// observers for work path or active path
bool cfg_node_exists(bool active_cfg);