Changeset 141 for trunk

Timestamp:

Nov 16, 2005 1:09:17 PM (17 years ago)

Author:

dkearney

Message:

added const to RpUnits*'s. these now compile correctly with matlab's mex compiler

Location:

trunk/src/matlab

Files:

• rpUnitsConvertObjDbl.cc (modified) (1 diff)
• rpUnitsConvertObjStr.cc (modified) (1 diff)
• rpUnitsDefineUnit.cc (modified) (1 diff)
• rpUnitsFind.cc (modified) (1 diff)
• rpUnitsGetBasis.cc (modified) (1 diff)
• rpUnitsGetExponent.cc (modified) (1 diff)
• rpUnitsGetUnits.cc (modified) (1 diff)
• rpUnitsGetUnitsName.cc (modified) (1 diff)
• rpUnitsMakeMetric.cc (modified) (1 diff)

trunk/src/matlab/rpUnitsConvertObjDbl.cc

@@ -19 +19 @@
                  int nrhs, const mxArray *prhs[])
 {
-    int         result        = 0;
-    double      retVal        = 0;
-    int         fromObjHandle = 0;
-    int         toObjHandle   = 0;
-    RpUnits*    fromObj       = NULL;
-    RpUnits*    toObj         = NULL;
-    double      value         = 0;
+    int               result        = 0;
+    double            retVal        = 0;
+    int               fromObjHandle = 0;
+    int               toObjHandle   = 0;
+    const RpUnits*    fromObj       = NULL;
+    const RpUnits*    toObj         = NULL;
+    double            value         = 0;
 
     /* Check for proper number of arguments. */

trunk/src/matlab/rpUnitsConvertObjStr.cc

@@ -20 +20 @@
                  int nrhs, const mxArray *prhs[])
 {
-    int         result        = 0;
-    std::string retStr        = "";
-    int         fromObjHandle = 0;
-    int         toObjHandle   = 0;
-    RpUnits*    fromObj       = NULL;
-    RpUnits*    toObj         = NULL;
-    double      value         = 0;
-    int         showUnits     = 0;
+    int            result        = 0;
+    std::string    retStr        = "";
+    int            fromObjHandle = 0;
+    int            toObjHandle   = 0;
+    const RpUnits* fromObj       = NULL;
+    const RpUnits* toObj         = NULL;
+    double         value         = 0;
+    int            showUnits     = 0;
 
     /* Check for proper number of arguments. */

trunk/src/matlab/rpUnitsDefineUnit.cc

@@ -20 +20 @@
 {
     char *unitSymbol = NULL;
-    RpUnits* basis = NULL;
+    const RpUnits* basis = NULL;
     RpUnits* myUnit = NULL;
     int retHandle = 0;

trunk/src/matlab/rpUnitsFind.cc

@@ -20 +20 @@
 {
     char *unitSymbol = NULL;
-    RpUnits* myUnit = NULL;
+    const RpUnits* myUnit = NULL;
     int retHandle = 0;
 

trunk/src/matlab/rpUnitsGetBasis.cc

@@ -20 +20 @@
 {
     char *unitSymbol = NULL;
-    RpUnits* myBasis = NULL;
-    RpUnits* myUnit = NULL;
+    const RpUnits* myBasis = NULL;
+    const RpUnits* myUnit = NULL;
     int retHandle = 0;
     int unitsHandle = 0;

trunk/src/matlab/rpUnitsGetExponent.cc

@@ -19 +19 @@
                  int nrhs, const mxArray *prhs[])
 {
-    int         unitsHandle = 0;
-    RpUnits*    unitsObj    = NULL;
-    const char* retString   = NULL;
-    double      retVal      = 0.0;
+    int            unitsHandle = 0;
+    const RpUnits* unitsObj    = NULL;
+    const char*    retString   = NULL;
+    double         retVal      = 0.0;
 
     /* Check for proper number of arguments. */

trunk/src/matlab/rpUnitsGetUnits.cc

@@ -19 +19 @@
                  int nrhs, const mxArray *prhs[])
 {
-    int         unitsHandle = 0;
-    RpUnits*    unitsObj    = NULL;
-    const char* retString   = NULL;
+    int            unitsHandle = 0;
+    const RpUnits* unitsObj    = NULL;
+    const char*    retString   = NULL;
 
     /* Check for proper number of arguments. */

trunk/src/matlab/rpUnitsGetUnitsName.cc

@@ -19 +19 @@
                  int nrhs, const mxArray *prhs[])
 {
-    int         unitsHandle = 0;
-    RpUnits*    unitsObj    = NULL;
-    const char* retString   = NULL;
+    int            unitsHandle = 0;
+    const RpUnits* unitsObj    = NULL;
+    const char*    retString   = NULL;
 
     /* Check for proper number of arguments. */

trunk/src/matlab/rpUnitsMakeMetric.cc

@@ -19 +19 @@
                  int nrhs, const mxArray *prhs[])
 {
-    RpUnits* basis = NULL;
-    int retVal = 0;
-    int basisHandle = 0;
-    int retIndex = 0;
+    const RpUnits* basis       = NULL;
+    int            retVal      = 0;
+    int            basisHandle = 0;
+    int            retIndex    = 0;
 
     /* Check for proper number of arguments. */