Merge from mergeto_trunk_22Aug12

[samples/dsccode.git] / src / DSCCODCENG / DSCCODCENG.cxx

diff --git a/src/DSCCODCENG/DSCCODCENG.cxx b/src/DSCCODCENG/DSCCODCENG.cxx
index 7142c53617208935e9f7bb9cd9033530a97dbb8c..7f6ca541ea1f5cab75fe1b3d7364b7731f5b9a14 100755 (executable)
--- a/src/DSCCODCENG/DSCCODCENG.cxx
+++ b/src/DSCCODCENG/DSCCODCENG.cxx
@@ -105,13 +105,13 @@ void DSCCODC_i::prun(CORBA::Long niter)
   SDATA_EN[0] = 3;
   SDATA_EN[1] = 1;
   SDATA_EN[2] = 2;
-  info = cp_een(component,CP_TEMPS,ti_re,i,"STP_EN",2,SDATA_EN);
+  info = cp_een(component,CP_TEMPS,ti_re,i,(char *)"STP_EN",2,SDATA_EN);
 
   float tf_re = 1.0; // step start time
   int max=3; // max size expected
   int n; // real size received
 
-  info = cp_len(component,CP_TEMPS,&ti_re,&tf_re,&i,"ETP_EN",max,&n,EDATA_EN);
+  info = cp_len(component,CP_TEMPS,&ti_re,&tf_re,&i,(char *)"ETP_EN",max,&n,EDATA_EN);
 
   for (int i = 0; i < n; ++i)
     cerr << "seqLongData[" << i << "] = " << EDATA_EN[i] << endl;
@@ -134,13 +134,13 @@ void DSCCODC_i::trun(CORBA::Long niter)
   float ti_re = 0.0; // time
   int  i = 0; // not used
 
-  info = cp_ere(component,CP_TEMPS,ti_re,i,"STP_RE",2,SDATA_RE);
+  info = cp_ere(component,CP_TEMPS,ti_re,i,(char *)"STP_RE",2,SDATA_RE);
   cerr << "apres cp_ere: " << info << endl;
 
   int max=3; // max size expected
   int n=2; // real size received
   float tf_re = 1.0; // time
-  info = cp_lre(component,CP_TEMPS,&ti_re,&tf_re,&i,"ETP_RE",max,&n,EDATA_RE);
+  info = cp_lre(component,CP_TEMPS,&ti_re,&tf_re,&i,(char *)"ETP_RE",max,&n,EDATA_RE);
 
   for (int i = 0; i < n; ++i)
     cerr << "seqRealData[" << i << "] = " << EDATA_RE[i] << endl;