Added support of BOOST's shared_ptr

diff --git a/src/TOOLSDS/Makefile.in b/src/TOOLSDS/Makefile.in
index 688895a9e543bede62c420aa4224e54e5a1a8116..866f491f1576a405d83ec0388d22e5b86f9d488a 100644 (file)
--- a/src/TOOLSDS/Makefile.in
+++ b/src/TOOLSDS/Makefile.in
@@ -27,8 +27,8 @@ LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl SALOM
 BIN_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl
 BIN_CLIENT_IDL = 
 
-CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES)
-CXXFLAGS+=$(OCC_CXXFLAGS)
+CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) 
+CXXFLAGS+=$(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) 
 LDFLAGS+= -lOpUtil $(CAS_LDPATH) -lTKernel
 
 @CONCLUDE@

diff --git a/src/TOOLSDS/SALOMEDS_Tool.cxx b/src/TOOLSDS/SALOMEDS_Tool.cxx
index 18ae883eaea7438ee4ac93f479cdd87d7f2bf57c..7a133efcb3d2061290b6678c009a8503d9c5ca6b 100644 (file)
--- a/src/TOOLSDS/SALOMEDS_Tool.cxx
+++ b/src/TOOLSDS/SALOMEDS_Tool.cxx
@@ -62,8 +62,6 @@ std::string SALOMEDS_Tool::GetTmpDir()
   TCollection_AsciiString aSubDir(aRND);
   if(aSubDir.Length() <= 1) aSubDir = TCollection_AsciiString("123409876");
 
-  MESSAGE("#### RND "  << aRND);
-
   aTmpDir += aSubDir; //Get RND sub directory
 
 #ifdef WIN32
@@ -413,16 +411,15 @@ void SALOMEDS_Tool::GetAllChildren( SALOMEDS::Study_var               theStudy,
 // name    : GetFlag
 // Purpose : Retrieve specified flaf from "AttributeFlags" attribute
 //=======================================================================
-bool SALOMEDS_Tool::GetFlag( const int               theFlag,
-                             SALOMEDSClient_Study*   theStudy,
-                             SALOMEDSClient_SObject* theObj )
+bool SALOMEDS_Tool::GetFlag( const int     theFlag,
+                             _PTR(Study)   theStudy,
+                             _PTR(SObject) theObj )
 {
-  SALOMEDSClient_GenericAttribute* anAttr = NULL;
+  _PTR(GenericAttribute) anAttr;
   if ( theObj && theObj->FindAttribute( anAttr, "AttributeFlags" ) )
   {
-    SALOMEDSClient_AttributeFlags* aFlags = dynamic_cast<SALOMEDSClient_AttributeFlags*>( anAttr );
+    _PTR(AttributeFlags) aFlags( anAttr );
     bool ret = aFlags->Get( theFlag );
-    delete aFlags;
     return ret;
   }
 
@@ -434,29 +431,25 @@ bool SALOMEDS_Tool::GetFlag( const int               theFlag,
 // Purpose : Set/Unset specified flaf from "AttributeFlags" attribute
 //=======================================================================
 bool SALOMEDS_Tool::SetFlag( const int             theFlag,
-                             SALOMEDSClient_Study* theStudy,
+                             _PTR(Study)           theStudy,
                              const std::string&    theEntry,
                              const bool            theValue )
 {
-  SALOMEDSClient_SObject* anObj = theStudy->FindObjectID(theEntry.c_str());
+  _PTR(SObject) anObj (theStudy->FindObjectID(theEntry.c_str()));
 
   if ( anObj )
   {
-    SALOMEDSClient_GenericAttribute* aGAttr;
+    _PTR(GenericAttribute) aGAttr;
     if ( anObj->FindAttribute( aGAttr, "AttributeFlags" ) )
     {
-      SALOMEDSClient_AttributeFlags* anAttr = dynamic_cast<SALOMEDSClient_AttributeFlags*>( aGAttr );
+      _PTR(AttributeFlags) anAttr ( aGAttr );
       anAttr->Set( theFlag, theValue );
-      delete anAttr;
     }
     else if ( theValue )
     {
-      SALOMEDSClient_StudyBuilder* aBuilder = theStudy->NewBuilder();
-      SALOMEDSClient_AttributeFlags* anAttr = dynamic_cast<SALOMEDSClient_AttributeFlags*>(
-        aBuilder->FindOrCreateAttribute( anObj, "AttributeFlags" ) );
+      _PTR(StudyBuilder) aBuilder ( theStudy->NewBuilder() );
+      _PTR(AttributeFlags) anAttr = aBuilder->FindOrCreateAttribute( anObj, "AttributeFlags" );
       anAttr->Set( theFlag, theValue );
-      delete anAttr;
-      delete aBuilder;
     }
     return true;
   }
@@ -469,39 +462,35 @@ bool SALOMEDS_Tool::SetFlag( const int             theFlag,
 // Purpose : Get all entries of children of object.
 //           If theObj is null all entries of objects of study are returned
 //=======================================================================
-void SALOMEDS_Tool::GetAllChildren( SALOMEDSClient_Study*               theStudy,
-                                    SALOMEDSClient_SObject*             theObj,
-                                    std::list<std::string>& theList )
+void SALOMEDS_Tool::GetAllChildren( _PTR(Study)               theStudy,
+                                    _PTR(SObject)             theObj,
+                                    std::list<std::string>&   theList )
 {
   if ( !theObj )
   {
-    SALOMEDSClient_SComponentIterator* anIter = theStudy->NewComponentIterator();
+    _PTR(SComponentIterator) anIter (theStudy->NewComponentIterator());
     for ( ; anIter->More(); anIter->Next() )
     {
-      SALOMEDSClient_SObject* anObj = anIter->Value();
+      _PTR(SObject) anObj ( anIter->Value() );
       if ( anObj )
       {
         theList.push_back( anObj->GetID() );
         GetAllChildren( theStudy, anObj, theList );
-       delete anObj;
       }
     }
-    delete anIter;
   }
   else
   {
-    SALOMEDSClient_ChildIterator* anIter = theStudy->NewChildIterator( theObj );
+    _PTR(ChildIterator) anIter ( theStudy->NewChildIterator( theObj ) );
     for ( ; anIter->More(); anIter->Next() )
     {
-      SALOMEDSClient_SObject* anObj = anIter->Value();
-      SALOMEDSClient_SObject* aRef;
+      _PTR(SObject) anObj ( anIter->Value() );
+      _PTR(SObject) aRef;
       if ( !anObj->ReferencedObject( aRef ) )
       {
         theList.push_back( anObj->GetID() );
         GetAllChildren( theStudy, anObj, theList );
-       delete anObj;
       }
-      else delete aRef;
     }
   }
 }

diff --git a/src/TOOLSDS/SALOMEDS_Tool.hxx b/src/TOOLSDS/SALOMEDS_Tool.hxx
index f6465a8e6c35836e502ed621434b2a248ff14b09..b3f898902756613fee54a17bb2a084896263fa6f 100644 (file)
--- a/src/TOOLSDS/SALOMEDS_Tool.hxx
+++ b/src/TOOLSDS/SALOMEDS_Tool.hxx
@@ -71,20 +71,20 @@ public:
 
 
   // Retrieves specified flaf from "AttributeFlags" attribute
-  static bool GetFlag( const int             theFlag,
-                       SALOMEDSClient_Study*   theStudy,
-                       SALOMEDSClient_SObject* theObj );
+  static bool GetFlag( const int     theFlag,
+                       _PTR(Study)   theStudy,
+                       _PTR(SObject) theObj );
 
   // Sets/Unsets specified flaf from "AttributeFlags" attribute
   static bool SetFlag( const int             theFlag,
-                       SALOMEDSClient_Study* theStudy,
+                       _PTR(Study) theStudy,
                        const std::string&    theEntry,
                        const bool            theValue );
 
   // Get all entries of children of object. If theObj is null all entries of objects of study are returned
-  static void GetAllChildren( SALOMEDSClient_Study*               theStudy,
-                              SALOMEDSClient_SObject*             theObj,
-                              std::list<std::string>& theList );
+  static void GetAllChildren( _PTR(Study)               theStudy,
+                              _PTR(SObject)             theObj,
+                              std::list<std::string>&   theList );
 
 };
 #endif