Merge branch 'V8_0_0_BR'

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

diff --git a/src/SALOMEDS/Test/SALOMEDSTest.cxx b/src/SALOMEDS/Test/SALOMEDSTest.cxx
index 68de91733a8be24b4e57a7ba8aba84685ddd0d6e..9a2c8d3ac14561812b2ece81ce61a632166489ac 100644 (file)
--- a/src/SALOMEDS/Test/SALOMEDSTest.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest.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
@@ -40,7 +42,6 @@
 #include "SALOMEDS_SObject.hxx"
 
 
-using namespace std;
 
 // ============================================================================
 /*!
@@ -51,7 +52,7 @@ using namespace std;
 void SALOMEDSTest::setUp()
 {  
   int argc = 1;
-  char* argv[] = {""};
+  char* argv[] = {(char*)""};
 
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
   ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
@@ -72,7 +73,7 @@ void SALOMEDSTest::setUp()
 void SALOMEDSTest::tearDown()
 {
   _PTR(StudyManager) sm ( new SALOMEDS_StudyManager(_sm) );
-  vector<string> v = sm->GetOpenStudies();
+  std::vector<std::string> v = sm->GetOpenStudies();
   for(int i = 0; i<v.size(); i++) {
     _PTR(Study) study = sm->GetStudyByName(v[i]);
     if(study)
@@ -128,7 +129,7 @@ void SALOMEDSTest::tearDown()
 void SALOMEDSTest_Embedded::setUp()
 {  
   int argc = 1;
-  char* argv[] = {""};
+  char* argv[] = {(char*)""};
 
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
   ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());