From 75ab6d49581aa262e72e8ce22ff9fee05d12d2dd Mon Sep 17 00:00:00 2001 From: maintenance team Date: Tue, 26 Sep 2006 08:13:44 +0000 Subject: [PATCH] Update for gcc4.1.1 --- src/Batch/Batch_Parametre.hxx | 2 +- src/SALOMEDS/SALOMEDS_Study_i.hxx | 2 +- src/SALOMEDSClient/SALOMEDSClient_definitions.hxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx | 6 +++--- src/SALOMEDSImpl/SALOMEDSImpl_IParameters.hxx | 4 ++-- src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Batch/Batch_Parametre.hxx b/src/Batch/Batch_Parametre.hxx index 125611351..bd9a9f294 100644 --- 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 e1fdc8656..dc617fe12 100644 --- 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 8b1137e37..cb2ce7a23 100644 --- a/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx +++ b/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx @@ -30,7 +30,7 @@ public: template explicit clt_shared_ptr(Y * p) { - reset(p); + boost::shared_ptr::reset(p); } template diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTarget.hxx index 0cfa7fda5..1ae8c0b0d 100644 --- 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 8965e8f91..f2bd76298 100644 --- 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 SALOMEDSImpl_IParameters::getAllParameterNames(const std::string& entry); + virtual std::vector getAllParameterNames(const std::string& entry); /*! Returns all parameter values of the given entry */ - virtual std::vector SALOMEDSImpl_IParameters::getAllParameterValues(const std::string& entry); + virtual std::vector 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 3aac4acb4..f04a836e6 100644 --- 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(); -- 2.39.2