fixes for g++ 4.5 (some members returned "the constructor, not the type")

[senf.git] / senf / Utils / Console / Config.ih

diff --git a/senf/Utils/Console/Config.ih b/senf/Utils/Console/Config.ih
index d85a646..ebc0983 100644 (file)
--- a/senf/Utils/Console/Config.ih
+++ b/senf/Utils/Console/Config.ih
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -30,17 +30,17 @@
 #include <boost/utility.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include "Executor.hh"
-#include "../../Utils/intrusive_refcount.hh"
-#include "../../Utils/DiscardStream.hh"
+#include <senf/Utils/intrusive_refcount.hh>
+#include <senf/Utils/DiscardStream.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
 namespace detail {
 
     /** \brief Internal: Executor wrapper implementing restricted execution
-        
+
         A RestrictedExecutor will only process commands which a re children of a given node. It does
         \e not follow any links.
      */
@@ -50,23 +50,23 @@ namespace detail {
     public:
         typedef void result_type;
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
         //\/name Structors and default members
-        ///\{
+        //\{
 
         RestrictedExecutor(DirectoryNode & root = senf::console::root());
 
-        ///\}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-/////////////////////////////////////////////////////////////////////////////////////////
 
         void execute(std::ostream & output, ParseCommandInfo const & command);
                                         ///< Execute command
-                                        /**< Output will be written to \a output. 
+                                        /**< Output will be written to \a output.
                                              Same as operator()(). */
 
         void operator()(std::ostream & output, ParseCommandInfo const & command);
                                         ///< Execute command
-                                        /**< Output will be written to \a output. 
+                                        /**< Output will be written to \a output.
                                              Same as execute(). */
 
         GenericNode & getNode(ParseCommandInfo const & command);
@@ -102,23 +102,23 @@ namespace detail {
     };
 
     /** \brief Internal: Set restricted node of a RestrictedExecutor
-        
+
         A RestrictGuard will set the node to which to restrict. It will automatically reset the node
         in it's destructor.
      */
     class RestrictedExecutor::RestrictGuard
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
         //\/name Structors and default members
-        ///\{
+        //\{
 
         explicit RestrictGuard(RestrictedExecutor & executor);
         RestrictGuard(RestrictedExecutor & executor, DirectoryNode & restrict);
         ~RestrictGuard();
 
-        ///\}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-/////////////////////////////////////////////////////////////////////////////////////////
 
     protected:
 
@@ -149,7 +149,7 @@ namespace detail {
 
 }}}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f