Experimental Physics and
Industrial Control System

"Shen, Guobao" <[email protected]> · Tue, 14 Jun 2011 15:08:23 -0400

In recent Matlab 2011a, the mxCreateDoubleScalar() has be replaced by

mxCreateScalarDouble()

definition is included in matrix.h.
A patch has been attached.

Guobao

--- mca.cpp	2011-06-14 15:02:34.113042001 -0400
+++ mca.cpp-orig	2010-11-18 11:00:47.000000000 -0500
@@ -9,7 +9,6 @@
 
 // Matlab
 #include "mex.h"
-#include "matrix.h"
 
 // Base
 #include <shareLib.h>
@@ -131,9 +130,9 @@
 static const char* MCAInfoFields[] = { "Handle", "PVName", "ElementCount", "NativeType", "State", "MCAMessage", "Host","Units" };
 static void getChannelInfo(Channel *Chan, mxArray *matrix, int row)
 {
-    mxSetFieldByNumber(matrix, row, 0, mxCreateDoubleScalar(Chan->GetHandle()));
+    mxSetFieldByNumber(matrix, row, 0, mxCreateScalarDouble(Chan->GetHandle()));
     mxSetFieldByNumber(matrix, row, 1, mxCreateString(Chan->GetPVName()));
-    mxSetFieldByNumber(matrix, row, 2, mxCreateDoubleScalar(Chan->GetNumElements()));
+    mxSetFieldByNumber(matrix, row, 2, mxCreateScalarDouble(Chan->GetNumElements()));
     switch (Chan->GetState())
     {
     case cs_conn:
@@ -197,7 +196,7 @@
         {
             // First argument of prhs is the command switch
             mxGetString(prhs[i + 1], PVName, PVNAME_SZ+1);
-            plhs[i] = mxCreateDoubleScalar(addChannel(PVName));
+            plhs[i] = mxCreateScalarDouble(addChannel(PVName));
         }
         break;
     }
@@ -698,7 +697,7 @@
             else // AddEvent should already have bailed out by now...
                 OK = false;
         }
-        plhs[0] = mxCreateDoubleScalar(OK ? 1.0 : 0.0);
+        plhs[0] = mxCreateScalarDouble(OK ? 1.0 : 0.0);
         break;
     }



Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System