Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add test MPI2 communication
[modules/kernel.git]
/
src
/
SALOMEDS
/
SALOMEDS_StudyBuilder.cxx
diff --git
a/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
b/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
index 4b6da19395317ea3980b5ecfdfc78fe24024af66..adf26c6df0be673a8963ff21fdf1f8d6582218c9 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
+++ b/
src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
@@
-1,28
+1,29
@@
-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
+// License as published by the Free Software Foundation; either
// version 2.1 of the License.
// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//
+// This library is distributed in the hope that it will be useful
,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// File : SALOMEDS_StudyBuilder.cxx
// Author : Sergey RUIN
// Module : SALOME
// File : SALOMEDS_StudyBuilder.cxx
// Author : Sergey RUIN
// Module : SALOME
-
-
-
+//
#include "utilities.h"
#include "SALOMEDS_StudyBuilder.hxx"
#include "utilities.h"
#include "SALOMEDS_StudyBuilder.hxx"
@@
-49,8
+50,6
@@
#include "Utils_ORB_INIT.hxx"
#include "Utils_SINGLETON.hxx"
#include "Utils_ORB_INIT.hxx"
#include "Utils_SINGLETON.hxx"
-using namespace std;
-
SALOMEDS_StudyBuilder::SALOMEDS_StudyBuilder(SALOMEDSImpl_StudyBuilder* theBuilder)
{
_isLocal = true;
SALOMEDS_StudyBuilder::SALOMEDS_StudyBuilder(SALOMEDSImpl_StudyBuilder* theBuilder)
{
_isLocal = true;
@@
-95,7
+94,7
@@
_PTR(SComponent) SALOMEDS_StudyBuilder::NewComponent(const std::string& Componen
}
void SALOMEDS_StudyBuilder::DefineComponentInstance (const _PTR(SComponent)& theSCO,
}
void SALOMEDS_StudyBuilder::DefineComponentInstance (const _PTR(SComponent)& theSCO,
- const std::string& ComponentIOR)
+
const std::string& ComponentIOR)
{
if(!theSCO) return;
{
if(!theSCO) return;
@@
-248,7
+247,7
@@
void SALOMEDS_StudyBuilder::RemoveObjectWithChildren(const _PTR(SObject)& theSO)
}
_PTR(GenericAttribute) SALOMEDS_StudyBuilder::FindOrCreateAttribute(const _PTR(SObject)& theSO,
}
_PTR(GenericAttribute) SALOMEDS_StudyBuilder::FindOrCreateAttribute(const _PTR(SObject)& theSO,
- const std::string& aTypeOfAttribute)
+
const std::string& aTypeOfAttribute)
{
SALOMEDSClient_GenericAttribute* anAttr = NULL;
if(!theSO) return _PTR(GenericAttribute)(anAttr);
{
SALOMEDSClient_GenericAttribute* anAttr = NULL;
if(!theSO) return _PTR(GenericAttribute)(anAttr);
@@
-276,8
+275,8
@@
_PTR(GenericAttribute) SALOMEDS_StudyBuilder::FindOrCreateAttribute(const _PTR(S
}
bool SALOMEDS_StudyBuilder::FindAttribute(const _PTR(SObject)& theSO,
}
bool SALOMEDS_StudyBuilder::FindAttribute(const _PTR(SObject)& theSO,
- _PTR(GenericAttribute)& anAttribute,
- const std::string& aTypeOfAttribute)
+
_PTR(GenericAttribute)& anAttribute,
+
const std::string& aTypeOfAttribute)
{
bool ret;
{
bool ret;