merge from branch BR_V5_DEV

[modules/kernel.git] / src / DSC / DSC_User / Datastream / Calcium / CalciumPortTraits.hxx

diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumPortTraits.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumPortTraits.hxx
index d05cc440df6e41e9689187b95eb0007b5f35a03d..b607de11908c97e292990295da4edc98a65722c9 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/CalciumPortTraits.hxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/CalciumPortTraits.hxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 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 
-//  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 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  Copyright (C) 2007-2008  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
+//  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
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : CalciumPortTraits.hxx
 //  Author : Eric Fayolle (EDF)
@@ -25,16 +25,18 @@
 // Modified by : $LastChangedBy$
 // Date        : $LastChangedDate: 2007-02-28 15:26:32 +0100 (mer, 28 fév 2007) $
 // Id          : $Id$
-
+//
 #ifndef _PORT_TRAITS_HXX_
 #define _PORT_TRAITS_HXX_
 
 #include "Superv_Component_i.hxx"
+#include "calcium_port_factory.hxx"
 
 // PROVIDES PORT TRAITS
-struct UnknownProvidesPortType {};
+template <class T> struct UnknownProvidesPortType {};
+
 template <class T> struct ProvidesPortTraits {
-  typedef  UnknownProvidesPortType PortType;
+  typedef  UnknownProvidesPortType<T> PortType;
 };
 template <> struct ProvidesPortTraits<int> {
   typedef  calcium_integer_port_provides PortType;
@@ -57,24 +59,22 @@ struct cplx {};
 template <> struct ProvidesPortTraits<cplx> {
    typedef calcium_complex_port_provides PortType;
 };
-// Défénition du type str pour obtenir le type de port
+// Définition du type str pour obtenir le type de port
 // correspondant
 struct str {};
 template <> struct ProvidesPortTraits<str> {
    typedef calcium_string_port_provides PortType;
 };
- template <> struct ProvidesPortTraits<char *> {
-   typedef  calcium_string_port_provides PortType;
- };
+
 
 template < typename T > struct StarTrait        { typedef  T NonStarType; };
 template < typename T > struct StarTrait< T * > { typedef  T NonStarType; };
 
 
 // USES PORT TRAITS
-struct UnknownUsesPortType {};
+template <class T> struct UnknownUsesPortType {};
 template <class T> struct UsesPortTraits {
-  typedef  UnknownUsesPortType PortType;
+  typedef  UnknownUsesPortType<T> PortType;
 };
 template <> struct UsesPortTraits<int> {
   typedef  calcium_integer_port_uses PortType;