Update for gcc4.1.1

diff --git a/src/Batch/Batch_Parametre.hxx b/src/Batch/Batch_Parametre.hxx
index 125611351c694c94f1fca33677cd3a610f15fdaa..bd9a9f294e6f129113b02653e58220bd98f12387 100644 (file)
--- a/src/Batch/Batch_Parametre.hxx
+++ b/src/Batch/Batch_Parametre.hxx
@@ -54,7 +54,7 @@ namespace Batch {
     Parametre();
 
     // Constructeur par recopie
-    Parametre::Parametre(const Parametre & PM);
+    Parametre(const Parametre & PM);
 
     // Operateur de recherche dans la map
     Versatile & operator [] (const string &);

diff --git a/src/SALOMEDS/SALOMEDS_Study_i.hxx b/src/SALOMEDS/SALOMEDS_Study_i.hxx
index e1fdc8656699121befcf66da1b1c29dd1a76f248..dc617fe12b473f1636dcefd0b79335944c658b1c 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Study_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.hxx
@@ -247,7 +247,7 @@ public:
   
   virtual SALOMEDS::Study::ListOfSObject* FindDependances(SALOMEDS::SObject_ptr anObject);
 
-  virtual SALOMEDS::AttributeStudyProperties_ptr SALOMEDS_Study_i::GetProperties();
+  virtual SALOMEDS::AttributeStudyProperties_ptr GetProperties();
 
   virtual char* GetLastModificationDate();
 

diff --git a/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx b/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx
index 8b1137e37e3b6c35a3ce9270311fc121d0bf6997..cb2ce7a230826583c54e72eefb754c587cf8e957 100644 (file)
--- a/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx
+++ b/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx
@@ -30,7 +30,7 @@ public:
   template<class Y>
     explicit clt_shared_ptr(Y * p)
       {
-       reset(p);
+       boost::shared_ptr<T>::reset(p);
       }
   
   template<class Y>

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx
index 0cfa7fda56dc720517a70f1ee4d79a5c4fbbf081..1ae8c0b0d6eba0c1c8a935b13031791beae9e97d 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx
@@ -52,9 +52,9 @@ public:
 Standard_EXPORT static const Standard_GUID& GetID() ;
 Standard_EXPORT static  Handle_SALOMEDSImpl_AttributeTarget Set(const TDF_Label& label) ;
 Standard_EXPORT SALOMEDSImpl_AttributeTarget();
-Standard_EXPORT void SALOMEDSImpl_AttributeTarget::Add(const Handle(SALOMEDSImpl_SObject)& theSO);
-Standard_EXPORT Handle(TColStd_HSequenceOfTransient) SALOMEDSImpl_AttributeTarget::Get();
-Standard_EXPORT void SALOMEDSImpl_AttributeTarget::Remove(const Handle(SALOMEDSImpl_SObject)& theSO);
+Standard_EXPORT void Add(const Handle(SALOMEDSImpl_SObject)& theSO);
+Standard_EXPORT Handle(TColStd_HSequenceOfTransient) Get();
+Standard_EXPORT void Remove(const Handle(SALOMEDSImpl_SObject)& theSO);
 Standard_EXPORT TCollection_ExtendedString GetRelation() { return myRelation; }
 Standard_EXPORT void SetRelation(const TCollection_ExtendedString& theRelation); 
 Standard_EXPORT TDF_AttributeList& GetVariables() { return myVariables; }

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx
index 8965e8f91bf9422f566c2434814eb170ec2a34c1..f2bd76298b8d5bf113017e700a5614b0f60aa8be 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx
@@ -76,12 +76,12 @@ public:
   /*!
     Returns all parameter names of the given entry
    */
-  virtual std::vector<std::string> SALOMEDSImpl_IParameters::getAllParameterNames(const std::string& entry);
+  virtual std::vector<std::string> getAllParameterNames(const std::string& entry);
 
   /*!
     Returns all parameter  values of the given entry
    */
-  virtual std::vector<std::string> SALOMEDSImpl_IParameters::getAllParameterValues(const std::string& entry);
+  virtual std::vector<std::string> getAllParameterValues(const std::string& entry);
 
   /*!
     Returns a number of parameters of the given entry

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
index 3aac4acb472773282b1da2c1745092f5e6a62292..f04a836e6b54504809d8b54cc30341f28fde1980 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
@@ -219,7 +219,7 @@ public:
   
   Standard_EXPORT virtual Handle(TColStd_HSequenceOfTransient) FindDependances(const Handle(SALOMEDSImpl_SObject)& anObject);
 
-  Standard_EXPORT virtual Handle(SALOMEDSImpl_AttributeStudyProperties) SALOMEDSImpl_Study::GetProperties();
+  Standard_EXPORT virtual Handle(SALOMEDSImpl_AttributeStudyProperties) GetProperties();
 
   Standard_EXPORT virtual TCollection_AsciiString GetLastModificationDate();