Merge branch V7_3_1_BR

[modules/yacs.git] / src / engine / Test / ContainerTest.cxx

diff --git a/src/engine/Test/ContainerTest.cxx b/src/engine/Test/ContainerTest.cxx
index 9dd184201b2776c690efd4b7524dda69b943f7bb..414e197c850546c54da05843f7598e713d368d0d 100644 (file)
--- a/src/engine/Test/ContainerTest.cxx
+++ b/src/engine/Test/ContainerTest.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2014  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
@@ -49,7 +49,7 @@ bool ContainerTest::isAlreadyStarted(const ComponentInstance *inst) const
   return _alreadyStarted;
 }
 
-void ContainerTest::start(const ComponentInstance *inst) throw(Exception)
+void ContainerTest::start(const ComponentInstance *inst) throw(YACS::Exception)
 {
   if(_alreadyStarted)
     throw Exception("ContainerTest already started !!!!");
@@ -67,7 +67,7 @@ Container *ContainerTest::clone() const
     return new ContainerTest;
 }
 
-void ContainerTest::checkCapabilityToDealWith(const ComponentInstance *inst) const throw(Exception)
+void ContainerTest::checkCapabilityToDealWith(const ComponentInstance *inst) const throw(YACS::Exception)
 {
   if(inst->getKind()!=SUPPORTED_COMP_KIND)
     throw Exception("ContainerTest not compatible with this type of instance.");
@@ -87,7 +87,7 @@ bool ContainerTest2::isAlreadyStarted(const ComponentInstance *inst) const
   return _alreadyStarted;
 }
 
-void ContainerTest2::start(const ComponentInstance *inst) throw(Exception)
+void ContainerTest2::start(const ComponentInstance *inst) throw(YACS::Exception)
 {
   if(_alreadyStarted)
     throw Exception("ContainerTest already started !!!!");
@@ -110,7 +110,7 @@ void ContainerTest2::initAllContainers()
   _counter=0;
 }
 
-void ContainerTest2::checkCapabilityToDealWith(const ComponentInstance *inst) const throw(Exception)
+void ContainerTest2::checkCapabilityToDealWith(const ComponentInstance *inst) const throw(YACS::Exception)
 {
   if(inst->getKind()!=SUPPORTED_COMP_KIND)
     throw Exception("ContainerTest not compatible with this type of instance.");