From 5374090b3a9e3473eaf3e690b134967a735531a1 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:07:44 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- COMPONENT_version.h.in | 2 +- Makefile.am | 2 +- adm_local/Makefile.am | 2 +- adm_local/unix/Makefile.am | 2 +- adm_local/unix/config_files/Makefile.am | 2 +- adm_local/unix/config_files/check_COMPONENT.m4 | 2 +- adm_local/unix/make_common_starter.am | 2 +- bin/Makefile.am | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 2 +- idl/AddComponent.idl | 2 +- idl/AdditionComponent.idl | 2 +- idl/Calculator.idl | 2 +- idl/DataStreamComponent.idl | 2 +- idl/DivComponent.idl | 2 +- idl/FactorialComponent.idl | 2 +- idl/Makefile.am | 2 +- idl/MulComponent.idl | 2 +- idl/SIGNALSComponent.idl | 2 +- idl/SubComponent.idl | 2 +- idl/SyrComponent.idl | 2 +- idl/SyrControlComponent.idl | 2 +- idl/TypesCheck.idl | 2 +- idl/UndefinedSymbolComponent.idl | 2 +- resources/COMPONENTCatalog.xml.in | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml.in | 2 +- src/AddComponent/AddComponent_CheckOfUndefined.cxx | 2 +- src/AddComponent/AddComponent_Impl.cxx | 2 +- src/AddComponent/AddComponent_Impl.hxx | 2 +- src/AddComponent/Adder_Impl.cxx | 2 +- src/AddComponent/Adder_Impl.hxx | 2 +- src/AddComponent/HandleServerSideSignals.cxx | 2 +- src/AddComponent/Makefile.am | 2 +- src/AdditionComponent/AdditionComponent_CheckOfUndefined.cxx | 2 +- src/AdditionComponent/AdditionComponent_Impl.cxx | 2 +- src/AdditionComponent/AdditionComponent_Impl.hxx | 2 +- src/AdditionComponent/Addition_Adder_Impl.cxx | 2 +- src/AdditionComponent/Addition_Adder_Impl.hxx | 2 +- src/AdditionComponent/Makefile.am | 2 +- src/CalculatorComponent/CalculatorEngine.cxx | 2 +- src/CalculatorComponent/CalculatorEngine.hxx | 2 +- src/CalculatorComponent/Makefile.am | 2 +- .../DataStreamComponent_CheckOfUndefined.cxx | 2 +- src/DataStreamComponent/DataStreamComponent_Impl.cxx | 2 +- src/DataStreamComponent/DataStreamComponent_Impl.hxx | 2 +- src/DataStreamComponent/Makefile.am | 2 +- src/DivComponent/DivComponent.cxx | 2 +- src/DivComponent/DivComponent.hxx | 2 +- src/DivComponent/Makefile.am | 2 +- src/FactorialComponent/FactorialComponent.py | 2 +- src/FactorialComponent/Makefile.am | 2 +- src/Makefile.am | 2 +- src/MulComponent/Makefile.am | 2 +- src/MulComponent/MulComponent.cxx | 2 +- src/MulComponent/MulComponent.hxx | 2 +- src/SIGNALSComponent/HandleServerSideSignals.cxx | 2 +- src/SIGNALSComponent/Makefile.am | 2 +- src/SIGNALSComponent/SIGNALSComponent.cxx | 2 +- src/SIGNALSComponent/SIGNALSComponent.hxx | 2 +- src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx | 2 +- src/SIGNALSComponent/SIGNALSComponent_Impl.cxx | 2 +- src/SIGNALSComponent/SIGNALSComponent_Impl.hxx | 2 +- src/SIGNALSComponent_Swig/Makefile.am | 2 +- src/SIGNALSComponent_Swig/libSIGNALSComponent_Swig.i | 2 +- src/SubComponent/Makefile.am | 2 +- src/SubComponent/SubComponent.cxx | 2 +- src/SubComponent/SubComponent.hxx | 2 +- src/SyrComponent/COMPONENT_shared_modules.py | 2 +- src/SyrComponent/Makefile.am | 2 +- src/SyrComponent/SyrComponent_CheckOfUndefined.cxx | 2 +- src/SyrComponent/SyrComponent_Impl.cxx | 2 +- src/SyrComponent/SyrComponent_Impl.hxx | 2 +- src/SyrControlComponent/Makefile.am | 2 +- src/SyrControlComponent/SyrControlComponent.py | 2 +- src/TestFunctions/DynInvoke.cxx | 2 +- src/TestFunctions/DynInvoke.hxx | 2 +- src/TestFunctions/GEOM.py | 2 +- src/TestFunctions/Makefile.am | 2 +- src/TestFunctions/TestFunctions.cxx | 2 +- src/TestFunctions/TestFunctions.py | 2 +- src/TestFunctions/TestFunctionsMemory.cxx | 2 +- src/TestFunctions/TestFunctionsMemory1.cxx | 2 +- src/TestFunctions/TestFunctionsMemory2.cxx | 2 +- src/TestFunctions/TestFunctionsMemory3.cxx | 2 +- src/TestFunctions/TestFunctionsMemory4.cxx | 2 +- src/TypesCheck/Makefile.am | 2 +- src/TypesCheck/TypesCheck_CheckOfUndefined.cxx | 2 +- src/TypesCheck/TypesCheck_Impl.cxx | 2 +- src/TypesCheck/TypesCheck_Impl.hxx | 2 +- src/UndefinedSymbolComponent/Makefile.am | 2 +- src/UndefinedSymbolComponent/UndefinedSymbolComponent.cxx | 2 +- src/UndefinedSymbolComponent/UndefinedSymbolComponent.hxx | 2 +- 94 files changed, 94 insertions(+), 94 deletions(-) diff --git a/COMPONENT_version.h.in b/COMPONENT_version.h.in index 8ea4146..da9014d 100644 --- a/COMPONENT_version.h.in +++ b/COMPONENT_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/Makefile.am b/Makefile.am index 774a6c7..43fe978 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 9863d29..a8acbbd 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 0d5ee76..c68bae1 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index aa1e17e..2c5d387 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/config_files/check_COMPONENT.m4 b/adm_local/unix/config_files/check_COMPONENT.m4 index f15a287..41125ac 100755 --- a/adm_local/unix/config_files/check_COMPONENT.m4 +++ b/adm_local/unix/config_files/check_COMPONENT.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE dnl dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 4f70a70..e6cf13e 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/bin/Makefile.am b/bin/Makefile.am index c33d56c..5669d58 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_configure b/build_configure index 81ac8e5..c15b308 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/clean_configure b/clean_configure index 25c4117..4939051 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/configure.ac b/configure.ac index d6144fd..1168acc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/idl/AddComponent.idl b/idl/AddComponent.idl index 0316c35..9de1fde 100644 --- a/idl/AddComponent.idl +++ b/idl/AddComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/AdditionComponent.idl b/idl/AdditionComponent.idl index 0eea20e..48d045a 100644 --- a/idl/AdditionComponent.idl +++ b/idl/AdditionComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/Calculator.idl b/idl/Calculator.idl index 9311b2c..f63094e 100644 --- a/idl/Calculator.idl +++ b/idl/Calculator.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/DataStreamComponent.idl b/idl/DataStreamComponent.idl index 168c9ee..e2ceeef 100644 --- a/idl/DataStreamComponent.idl +++ b/idl/DataStreamComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/DivComponent.idl b/idl/DivComponent.idl index 6243430..4ab07d9 100644 --- a/idl/DivComponent.idl +++ b/idl/DivComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/FactorialComponent.idl b/idl/FactorialComponent.idl index c30650e..2bff3c7 100644 --- a/idl/FactorialComponent.idl +++ b/idl/FactorialComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/Makefile.am b/idl/Makefile.am index ffcfcc5..e27fa06 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/idl/MulComponent.idl b/idl/MulComponent.idl index 65e1540..be810c4 100644 --- a/idl/MulComponent.idl +++ b/idl/MulComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/SIGNALSComponent.idl b/idl/SIGNALSComponent.idl index df9bcf2..366dfbf 100755 --- a/idl/SIGNALSComponent.idl +++ b/idl/SIGNALSComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/SubComponent.idl b/idl/SubComponent.idl index 8126ff8..b11f397 100644 --- a/idl/SubComponent.idl +++ b/idl/SubComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/SyrComponent.idl b/idl/SyrComponent.idl index 26d988c..e411dbb 100755 --- a/idl/SyrComponent.idl +++ b/idl/SyrComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/SyrControlComponent.idl b/idl/SyrControlComponent.idl index dfd5afc..2ea729d 100644 --- a/idl/SyrControlComponent.idl +++ b/idl/SyrControlComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/TypesCheck.idl b/idl/TypesCheck.idl index c5b3501..d4762ac 100644 --- a/idl/TypesCheck.idl +++ b/idl/TypesCheck.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/idl/UndefinedSymbolComponent.idl b/idl/UndefinedSymbolComponent.idl index 24ab006..a5402d9 100755 --- a/idl/UndefinedSymbolComponent.idl +++ b/idl/UndefinedSymbolComponent.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 diff --git a/resources/COMPONENTCatalog.xml.in b/resources/COMPONENTCatalog.xml.in index dc568e0..858575a 100644 --- a/resources/COMPONENTCatalog.xml.in +++ b/resources/COMPONENTCatalog.xml.in @@ -1,6 +1,6 @@