INTEGRATION: CWS warnings01 (1.22.4); FILE MERGED

2005/11/01 12:47:38 cd 1.22.4.1: #i53898# Warning free code for sun solaris compiler

configmgr/source/treemgr/nodeimpl.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: nodeimpl.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:31:36 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 23:33:12 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -185,20 +185,20 @@ namespace
 {
     struct AbstractNodeCast : data::NodeVisitor
     {
-        virtual Result handle( data::ValueNodeAccess const& rNode)
-        {
-            throw Exception( "INTERNAL ERROR: Node is not a value node. Cast failing." );
-            return CONTINUE;
-        }
-        virtual Result handle( data::GroupNodeAccess const& rNode)
-        {
-            throw Exception( "INTERNAL ERROR: Node is not a group node. Cast failing." );
-            return CONTINUE;
-        }
-        virtual Result handle( data::SetNodeAccess const& rNode)
-        {
-            return CONTINUE;
-        }
+           virtual Result handle( data::ValueNodeAccess const& /*rNode*/)
+           {
+               throw Exception( "INTERNAL ERROR: Node is not a value node. Cast failing." );
+           }
+           virtual Result handle( data::GroupNodeAccess const& /*rNode*/)
+           {
+               throw Exception( "INTERNAL ERROR: Node is not a group node. Cast failing." );
+           }
+           virtual Result handle( data::SetNodeAccess const& /*rNode*/)
+           {
+               return CONTINUE;
+           }
+        protected:
+            using NodeVisitor::handle;
     };
 
     template <class NodeType>
@@ -221,7 +221,7 @@ namespace
         }
 
         operator NodeType& () const { return get(); }
-    private:
+        private:
         virtual Result handle( DataNodeType& ) { return DONE; }
 
         NodeType* m_pNode;

configmgr/source/treemgr/nodeimplobj.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: nodeimplobj.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:32:04 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 23:33:24 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1096,7 +1096,7 @@ SetElementChangeImpl* DeferredSetNodeImpl::doAdjustToAddedElement(data::Accessor
 }
 //-----------------------------------------------------------------------------
 
-SetElementChangeImpl* DeferredSetNodeImpl::doAdjustToRemovedElement(data::Accessor const& _aAccessor, Name const& aName, RemoveNode const& aRemoveNodeChange)
+SetElementChangeImpl* DeferredSetNodeImpl::doAdjustToRemovedElement(data::Accessor const& _aAccessor, Name const& aName, RemoveNode const& /*aRemoveNodeChange*/)
 {
     m_bDefault = false;
     if (Element* pLocalElement = m_aChangedData.getElement(aName))