PR: merge from tag mergeto_trunk_17Jan05

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

diff --git a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.hxx b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.hxx
index 044fbc460a75bce48d3a3871079b9d8f0fd9f2ce..4c7fa6a17d99cd102ffb868c579ebf1ed3875545 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.hxx
@@ -29,24 +29,21 @@
 #ifndef SALOMEDS_AttributeSequenceOfSequenceOfReal_i_HeaderFile
 #define SALOMEDS_AttributeSequenceOfSequenceOfReal_i_HeaderFile
 
-// IDL headers
 #include "SALOMEDS_SequenceOfRealAttribute.hxx"
+#include "SALOMEDS_GenericAttribute_i.hxx"
+
+// IDL headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-#include "SALOMEDS_GenericAttribute_i.hxx"
 
-class SALOMEDS_AttributeSequenceOfReal_i: public virtual POA_SALOMEDS::AttributeSequenceOfReal,
-                                         public virtual SALOMEDS_GenericAttribute_i {
-public:
-  
-  SALOMEDS_AttributeSequenceOfReal_i(const Handle(SALOMEDS_SequenceOfRealAttribute)& theSequenceOfRealAttr, 
-                                    CORBA::ORB_ptr orb) 
-  {
-    _myOrb = CORBA::ORB::_duplicate(orb);
-    _myAttr = theSequenceOfRealAttr;
-  };
-  ~SALOMEDS_AttributeSequenceOfReal_i() {};
+DEFINE_DERIVED_ATTR(AttributeSequenceOfReal,SALOMEDS_SequenceOfRealAttribute,true);
 
+class SALOMEDS_AttributeSequenceOfReal_i: 
+  public virtual POA_SALOMEDS::AttributeSequenceOfReal,
+  public virtual SALOMEDS_TAttributeSequenceOfReal_i 
+{
+  DEFINE_DERIVED_ATTR_METH_DEFAULT(AttributeSequenceOfReal,SALOMEDS_SequenceOfRealAttribute);
+public:
   void Assign(const SALOMEDS::DoubleSeq& other);
   SALOMEDS::DoubleSeq* CorbaSequence();
   void Add(CORBA::Double value);
@@ -57,6 +54,7 @@ public:
 
   char* Store();
   void Restore(const char*);
+
 };