PR: merge from tag mergeto_trunk_17Jan05

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

diff --git a/src/SALOMEDS/SALOMEDS_AttributeReal_i.hxx b/src/SALOMEDS/SALOMEDS_AttributeReal_i.hxx
index 42263a1612a7909f6e9b66c327e5cdbbdebdfa79..a7fa861e6601dfcc2a30a10964f924b89e91fd5f 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributeReal_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeReal_i.hxx
@@ -29,25 +29,24 @@
 #ifndef SALOMEDS_AttributeReal_i_HeaderFile
 #define SALOMEDS_AttributeReal_i_HeaderFile
 
-// IDL headers
 #include <TDataStd_Real.hxx>
+
+#include "SALOMEDS_GenericAttribute_i.hxx"
+
+// IDL headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-#include "SALOMEDS_GenericAttribute_i.hxx"
 
-class SALOMEDS_AttributeReal_i: public virtual POA_SALOMEDS::AttributeReal,
-                               public virtual SALOMEDS_GenericAttribute_i {
-public:
-  
-  SALOMEDS_AttributeReal_i(const Handle(TDataStd_Real)& theRealAttr, CORBA::ORB_ptr orb) 
-  {
-    _myOrb = CORBA::ORB::_duplicate(orb);
-    _myAttr = theRealAttr;
-  };
-  ~SALOMEDS_AttributeReal_i() {};
+DEFINE_DERIVED_ATTR(AttributeReal,TDataStd_Real,true);
 
+class SALOMEDS_AttributeReal_i: 
+  public virtual POA_SALOMEDS::AttributeReal,
+  public virtual SALOMEDS_TAttributeReal_i 
+{
+  DEFINE_DERIVED_ATTR_METH_DEFAULT(AttributeReal,TDataStd_Real);
+public:
   CORBA::Double Value();
-  void SetValue(CORBA::Double value);
+  void SetValue(CORBA::Double theValue);
 
   char* Store();
   void Restore(const char*);