Merge branch 'V8_0_0_BR'

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

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
index 270ba559b8d9779e537b0631278c9bb972490754..370dfd637b58bb2a673c47b6ec5eb64b3f7e2512 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
@@ -1,18 +1,20 @@
-// Copyright (C) 2006  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2015  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
@@ -51,7 +53,7 @@ void SALOMEDSTest::testAttributeTreeNode()
   //Check the attribute creation
   CPPUNIT_ASSERT(_attr);
 
-  string TreeNodeID = "0e1c36e6-379b-4d90-ab3b-17a14310e648";
+  std::string TreeNodeID = "0e1c36e6-379b-4d90-ab3b-17a14310e648";
 
   _PTR(SObject) so1 = study->CreateObjectID("0:1:2");
                                                                
@@ -179,12 +181,12 @@ void SALOMEDSTest::testAttributeTreeNode()
 
   CPPUNIT_ASSERT(_attr2->GetTreeID() == TreeNodeID); 
 #else
-  cout << endl << "THE TEST IS NOT COMPLETE !!!" << endl;
+  std::cout << std::endl << "THE TEST IS NOT COMPLETE !!!" << std::endl;
 #endif
 
 
   //Try to create the attribute with given TreeID
-  string value = "0e1c36e6-1111-4d90-ab3b-18a14310e648";
+  std::string value = "0e1c36e6-1111-4d90-ab3b-18a14310e648";
   _PTR(AttributeTreeNode) _attr_guid = studyBuilder->FindOrCreateAttribute(so, "AttributeTreeNodeGUID"+value);
   CPPUNIT_ASSERT(_attr_guid && _attr_guid->GetTreeID() == value);