Added ICMPv6 Packet Parser and Unittests for different ICMP Packages.

[senf.git] / Console / Config.cci

diff --git a/Console/Config.cci b/Console/Config.cci
index 1fb445b..1f41ebf 100644 (file)
--- a/Console/Config.cci
+++ b/Console/Config.cci
@@ -32,6 +32,28 @@
 ///////////////////////////////cci.p///////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::RestrictedExecutor
+
+prefix_ bool senf::console::detail::RestrictedExecutor::complete()
+    const
+{
+    return parsedNodes_.size() == 1 
+        && ! parsedNodes_[0].expired() 
+        && *parsedNodes_[0].lock() == executor_.chroot();
+}
+
+prefix_ void senf::console::detail::RestrictedExecutor::reset()
+{
+    parsedNodes_.clear();
+}
+
+prefix_ senf::console::DirectoryNode & senf::console::detail::RestrictedExecutor::root()
+    const
+{
+    return executor_.chroot();
+}
+
+///////////////////////////////////////////////////////////////////////////
 // senf::console::ConfigBundle
 
 prefix_ senf::console::ConfigBundle::ConfigBundle()
@@ -41,11 +63,6 @@ prefix_ senf::console::ConfigBundle::ConfigBundle(DirectoryNode & root)
     : executor_ (root)
 {}
 
-prefix_ void senf::console::ConfigBundle::add(detail::ConfigSource::ptr source)
-{
-    sources_.push_back(source);
-}
-
 prefix_ bool senf::console::ConfigBundle::complete()
     const
 {
@@ -64,28 +81,6 @@ prefix_ void senf::console::ConfigBundle::reset()
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::console::detail::RestrictedExecutor
-
-prefix_ bool senf::console::detail::RestrictedExecutor::complete()
-    const
-{
-    return parsedNodes_.size() == 1 
-        && ! parsedNodes_[0].expired() 
-        && *parsedNodes_[0].lock() == executor_.chroot();
-}
-
-prefix_ void senf::console::detail::RestrictedExecutor::reset()
-{
-    parsedNodes_.clear();
-}
-
-prefix_ senf::console::DirectoryNode & senf::console::detail::RestrictedExecutor::root()
-    const
-{
-    return executor_.chroot();
-}
-
-///////////////////////////////////////////////////////////////////////////
 // senf::console::detail::ConfigSource
 
 prefix_ void senf::console::detail::ConfigSource::parse(RestrictedExecutor & executor)
@@ -130,11 +125,6 @@ prefix_ void senf::console::detail::BundleMixin::reset()
     bundle_.reset();
 }
 
-prefix_ void senf::console::detail::BundleMixin::add(ConfigSource::ptr source)
-{
-    bundle_.add(source);
-}
-
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_