Merge branch 'master' into omu/workloadmanager

[modules/yacs.git] / Demo / echoSrv.cxx

diff --git a/Demo/echoSrv.cxx b/Demo/echoSrv.cxx
index bce197e735f2932af8cf23f98ab6574888272a22..3d7f51c85d61416fc5a1047bd2a2408b7584bf86 100644 (file)
--- a/Demo/echoSrv.cxx
+++ b/Demo/echoSrv.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2020  CEA/DEN, EDF R&D
 //
 // 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.
+// 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
@@ -91,7 +91,7 @@ public:
   inline Echo_i() {}
   virtual ~Echo_i() {}
   virtual char* echoString(const char* mesg);
-  CORBA::Long echoLong(CORBA::Long i) throw(eo::SALOME_Exception);
+  CORBA::Long echoLong(CORBA::Long i);
   void echoDouble(CORBA::Double i,CORBA::Double& j) ;
   void echoDoubleVec(const eo::DoubleVec& i,eo::DoubleVec_out j) ;
   void echoDoubleVecVec(const eo::DoubleVecVec&, eo::DoubleVecVec_out);
@@ -192,7 +192,7 @@ void Echo_i::echoDoubleVecVec(const eo::DoubleVecVec& in, eo::DoubleVecVec_out o
   out=new eo::DoubleVecVec(in);
 }
 
-CORBA::Long Echo_i::echoLong(CORBA::Long i ) throw(eo::SALOME_Exception) 
+CORBA::Long Echo_i::echoLong(CORBA::Long i )
 {
   DEBTRACE("Echo_i::echoLong " << i);
   CORBA::Long j=i;