Merge remote-tracking branch 'origin/master' into windows
[scilab.git] / scilab / modules / scicos / src / cpp / sciblk4.cpp
index 2d56cae..97d5e60 100644 (file)
@@ -294,7 +294,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             if (Blocks->nx != 0)
             {
                 /* 14 - xd */
-                if (getDoubleArray(t->getField(L"xd"), Blocks->xd) == false)
+                if (getDoubleArray(t->getField("xd"), Blocks->xd) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -304,7 +304,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
                 if ((funtyp[kfun - 1] == 10004) || (funtyp[kfun - 1] == 10005))
                 {
                     /* 15 - res */
-                    if (getDoubleArray(t->getField(L"res"), Blocks->res) == false)
+                    if (getDoubleArray(t->getField("res"), Blocks->res) == false)
                     {
                         t->killMe();
                         set_block_error(-1);
@@ -322,7 +322,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             /* 21 - outptr */
             if (Blocks->nout > 0)
             {
-                types::InternalType* pIT = t->getField(L"outptr");
+                types::InternalType* pIT = t->getField("outptr");
                 if (pIT && pIT->isList())
                 {
                     types::List* lout = pIT->getAs<types::List>();
@@ -351,7 +351,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             /* 7 - z */
             if (Blocks[0].nz != 0)
             {
-                if (getDoubleArray(t->getField(L"z"), Blocks->z) == false)
+                if (getDoubleArray(t->getField("z"), Blocks->z) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -365,7 +365,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             if (Blocks[0].nx != 0)
             {
                 /* 13 - x */
-                if (getDoubleArray(t->getField(L"x"), Blocks->x) == false)
+                if (getDoubleArray(t->getField("x"), Blocks->x) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -373,7 +373,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
                 }
 
                 /* 14 - xd */
-                if (getDoubleArray(t->getField(L"xd"), Blocks->xd) == false)
+                if (getDoubleArray(t->getField("xd"), Blocks->xd) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -390,7 +390,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
         case 3:
         {
             /* 23 - evout */
-            if (getDoubleArray(t->getField(L"evout"), Blocks->evout) == false)
+            if (getDoubleArray(t->getField("evout"), Blocks->evout) == false)
             {
                 t->killMe();
                 set_block_error(-1);
@@ -406,7 +406,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             /* 7 - z */
             if (Blocks[0].nz != 0)
             {
-                if (getDoubleArray(t->getField(L"z"), Blocks->z) == false)
+                if (getDoubleArray(t->getField("z"), Blocks->z) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -420,7 +420,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             if (Blocks[0].nx != 0)
             {
                 /* 13 - x */
-                if (getDoubleArray(t->getField(L"x"), Blocks->x) == false)
+                if (getDoubleArray(t->getField("x"), Blocks->x) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -428,7 +428,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
                 }
 
                 /* 14 - xd */
-                if (getDoubleArray(t->getField(L"xd"), Blocks->xd) == false)
+                if (getDoubleArray(t->getField("xd"), Blocks->xd) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -444,7 +444,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             /* 7 - z */
             if (Blocks[0].nz != 0)
             {
-                if (getDoubleArray(t->getField(L"z"), Blocks->z) == false)
+                if (getDoubleArray(t->getField("z"), Blocks->z) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -466,7 +466,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             /* 7 - z */
             if (Blocks[0].nz != 0)
             {
-                if (getDoubleArray(t->getField(L"z"), Blocks->z) == false)
+                if (getDoubleArray(t->getField("z"), Blocks->z) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -480,7 +480,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             if (Blocks[0].nx != 0)
             {
                 /* 13 - x */
-                if (getDoubleArray(t->getField(L"x"), Blocks->x) == false)
+                if (getDoubleArray(t->getField("x"), Blocks->x) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -488,7 +488,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
                 }
 
                 /* 14 - xd */
-                if (getDoubleArray(t->getField(L"xd"), Blocks->xd) == false)
+                if (getDoubleArray(t->getField("xd"), Blocks->xd) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -499,7 +499,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             /* 21 - outptr */
             if (Blocks->nout > 0)
             {
-                types::InternalType* pIT = t->getField(L"outptr");
+                types::InternalType* pIT = t->getField("outptr");
                 if (pIT && pIT->isList())
                 {
                     types::List* lout = pIT->getAs<types::List>();
@@ -533,7 +533,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             if (Blocks[0].nx != 0)
             {
                 /* 40 - xprop */
-                if (getDoubleArrayAsInt(t->getField(L"xprop"), Blocks->xprop) == false)
+                if (getDoubleArrayAsInt(t->getField("xprop"), Blocks->xprop) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -549,7 +549,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
         case 9:
         {
             /* 33 - g */
-            if (getDoubleArray(t->getField(L"g"), Blocks->g) == false)
+            if (getDoubleArray(t->getField("g"), Blocks->g) == false)
             {
                 t->killMe();
                 set_block_error(-1);
@@ -559,7 +559,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             if (get_phase_simulation() == 1)
             {
                 /* 39 - mode */
-                if (getDoubleArrayAsInt(t->getField(L"mode"), Blocks->mode) == false)
+                if (getDoubleArrayAsInt(t->getField("mode"), Blocks->mode) == false)
                 {
                     t->killMe();
                     set_block_error(-1);
@@ -576,7 +576,7 @@ void sciblk4(scicos_block* Blocks, const int flag)
             if ((funtyp[kfun - 1] == 10004) || (funtyp[kfun - 1] == 10005))
             {
                 /* 15 - res */
-                if (getDoubleArray(t->getField(L"res"), Blocks->res) == false)
+                if (getDoubleArray(t->getField("res"), Blocks->res) == false)
                 {
                     t->killMe();
                     set_block_error(-1);