CCAR: change name of function create_port into create_calcium_port

diff --git a/src/DSC/DSC_Python/calcium.i b/src/DSC/DSC_Python/calcium.i
index 3c7c49a6e7edbdec199b374e7caf71c693732ffe..f7700dd20018f8051e4db3e1fe7c042a3e6113c0 100644 (file)
--- a/src/DSC/DSC_Python/calcium.i
+++ b/src/DSC/DSC_Python/calcium.i
@@ -224,7 +224,7 @@ class PySupervCompo:public Superv_Component_i
       }
 };
 
-extern "C" void create_port(Superv_Component_i* compo,char* name,char* type,char *mode,char* depend);
+extern "C" void create_calcium_port(Superv_Component_i* compo,char* name,char* type,char *mode,char* depend);
 
 #define   CP_TEMPS    40
 #define   CP_ITERATION    41

diff --git a/src/DSC/DSC_User/Datastream/Calcium/Calcium.cxx b/src/DSC/DSC_User/Datastream/Calcium/Calcium.cxx
index 6c3a680ca31d9ed6f978c91e8c76840c7ef1d9cd..46f2a773de1ca860581051b97d5597b95294404e 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/Calcium.cxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/Calcium.cxx
@@ -47,9 +47,8 @@ extern "C"
       }
   }
 
-  void create_port(Superv_Component_i* compo,char* name,char* type,char *mode,char* depend)
+  void create_calcium_port(Superv_Component_i* compo,char* name,char* type,char *mode,char* depend)
   {
-    std::cerr << "create_port: " << name << type << mode << depend << std::endl;
     if(std::string(mode) == "IN")
       {
         provides_port * port ;
@@ -64,18 +63,18 @@ extern "C"
               setDependency(port,type,CalciumTypes::TIME_DEPENDENCY);
             else
               {
-                std::cerr << "unknown dependency: " << depend << std::endl;
+                std::cerr << "create_calcium_port:unknown dependency: " << depend << std::endl;
               }
           }
         catch(const Superv_Component_i::PortAlreadyDefined& ex)
           {
             //Port already defined : we use the old one
             delete port;
-            std::cerr << "create_port: " << ex.what() << std::endl;
+            std::cerr << "create_calcium_port: " << ex.what() << std::endl;
           }
         catch ( ... )
           {
-            std::cerr << "create_port: unknown exception" << std::endl;
+            std::cerr << "create_calcium_port: unknown exception" << std::endl;
           }
       }
     else if(std::string(mode) == "OUT")
@@ -90,17 +89,17 @@ extern "C"
           {
             //Port already defined : we use the old one
             delete uport;
-            std::cerr << "create_port: " << ex.what() << std::endl;
+            std::cerr << "create_calcium_port: " << ex.what() << std::endl;
           }
         catch ( ... )
           {
-            std::cerr << "create_port: unknown exception" << std::endl;
+            std::cerr << "create_calcium_port: unknown exception" << std::endl;
           }
       }
     else
       {
         //Unknown mode
-        std::cerr << "Unknown mode: " << mode << std::endl;
+        std::cerr << "create_calcium_port:Unknown mode: " << mode << std::endl;
       }
   }
 

diff --git a/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx b/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx
index d8f6d501dc8f73a232b1930bc59aff277815c30e..a014eeefe50c1f8b9026c56ba3f9e55ca2bce582 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx
@@ -14,4 +14,4 @@ class PySupervCompo:public Superv_Component_i
 };
 
 
-extern "C" void create_port(Superv_Component_i* compo,char* name,char* type,char *mode,char* depend);
+extern "C" void create_calcium_port(Superv_Component_i* compo,char* name,char* type,char *mode,char* depend);