Merge branch 'V7_dev'

[modules/yacs.git] / src / SALOMEDS / Test / SALOMEDSTest_StudyBuilder.cxx

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_StudyBuilder.cxx b/src/SALOMEDS/Test/SALOMEDSTest_StudyBuilder.cxx
index 109ac0e2d6a01bfdf92058840eac6ba6c9a3c48f..a116d70a1c5cb23aa7bf496aed7dc17ca8bd3e64 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_StudyBuilder.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_StudyBuilder.cxx
@@ -1,18 +1,20 @@
-// Copyright (C) 2006  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2016  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
-// 
+//
 // 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 
-// 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 
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// 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.
 //
-// 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
@@ -46,9 +48,9 @@ void SALOMEDSTest::testStudyBuilder()
   CPPUNIT_ASSERT(sco1 && sco1->ComponentDataType() == "Test");
 
   //Check method DefineComponentInstance
-  string ior = _orb->object_to_string(_sm);
+  std::string ior = _orb->object_to_string(_sm);
   studyBuilder->DefineComponentInstance(sco1, ior);
-  string newior;
+  std::string newior;
   sco1->ComponentIOR(newior);
   CPPUNIT_ASSERT(newior == ior);
 
@@ -67,12 +69,12 @@ void SALOMEDSTest::testStudyBuilder()
   //Check method NewObject
   _PTR(SObject) so1 = studyBuilder->NewObject(sco3);
   CPPUNIT_ASSERT(so1);
-  string id1 = so1->GetID();
+  std::string id1 = so1->GetID();
 
   //Check method NewObjectToTag
   _PTR(SObject) so2 = studyBuilder->NewObjectToTag(so1, 2);
   CPPUNIT_ASSERT(so2 && so2->Tag() == 2);
-  string id2 = so2->GetID();
+  std::string id2 = so2->GetID();
 
   //Check method FindOrCreateAttribute
   _PTR(SObject) so3 = studyBuilder->NewObject(sco3);
@@ -128,7 +130,7 @@ void SALOMEDSTest::testStudyBuilder()
   CPPUNIT_ASSERT(!so2->ReferencedObject(refSO));
 
   //Check method SetGUID and IsGUID
-  string value = "0e1c36e6-379b-4d90-ab3b-17a14310e648";
+  std::string value = "0e1c36e6-379b-4d90-ab3b-17a14310e648";
   studyBuilder->SetGUID(so1, value);
 
   CPPUNIT_ASSERT(studyBuilder->IsGUID(so1, value));