Merge from branch CCRT_Port_V220.

[modules/kernel.git] / src / SALOMEDS / SALOMEDS_AttributeTreeNode_i.hxx

diff --git a/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.hxx b/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.hxx
index 14e134b275fd0fd2abbb707b5bd537b5e76ef45e..718ffc641ab17ff62411d6700a3bbdc0fbd4ea19 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.hxx
@@ -30,22 +30,21 @@
 #define SALOMEDS_AttributeTreeNode_i_HeaderFile
 
 // IDL headers
-#include <TDataStd_TreeNode.hxx>
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
+
+#include <TDataStd_TreeNode.hxx>
 #include "SALOMEDS_GenericAttribute_i.hxx"
 
-class SALOMEDS_AttributeTreeNode_i: public virtual POA_SALOMEDS::AttributeTreeNode,
-  public virtual SALOMEDS_GenericAttribute_i {
-public:
-  
-  SALOMEDS_AttributeTreeNode_i(const Handle(TDataStd_TreeNode)& theAttr, CORBA::ORB_ptr orb) 
-  {
-    _myOrb = CORBA::ORB::_duplicate(orb);
-    _myAttr = theAttr; 
-  };  
-  ~SALOMEDS_AttributeTreeNode_i() {};
+DEFINE_DERIVED_ATTR(AttributeTreeNode,TDataStd_TreeNode,false);
 
+class SALOMEDS_AttributeTreeNode_i: 
+  public virtual POA_SALOMEDS::AttributeTreeNode,
+  public virtual SALOMEDS_TAttributeTreeNode_i
+{
+  DEFINE_DERIVED_ATTR_METH(AttributeTreeNode,TDataStd_TreeNode::GetDefaultTreeID());
+
+public:
   void SetFather(SALOMEDS::AttributeTreeNode_ptr value);
   CORBA::Boolean HasFather();
   SALOMEDS::AttributeTreeNode_ptr GetFather();
@@ -77,4 +76,5 @@ public:
 
 };
 
+
 #endif