Changeset 569 for trunk


Ignore:
Timestamp:
Jan 23, 2007 10:17:11 PM (17 years ago)
Author:
dkearney
Message:

removed make metric functions from matlab and octave, fixed up the rappture dictionary set() function call in the bindings dict code.

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/core/RpBindingsDict.cc

    r536 r569  
    4444            dictKey = ObjDict_Lib.size() + 1;
    4545        }
    46         ObjDict_Lib.set(dictKey,objectName, &newEntry);
     46        ObjDict_Lib.set(dictKey,objectName, NULL,&newEntry);
    4747        retVal = dictKey;
    4848    }
    … …  
    138138        // no error checking to make sure it was successful in entering
    139139        // the new entry.
    140         ObjDictUnits.set(dictNextKey,objectName, &newEntry);
     140        ObjDictUnits.set(dictNextKey,objectName, NULL, &newEntry);
    141141        retVal = dictNextKey;
    142142    }

  • trunk/src/matlab/Makefile.in

    r563 r569  
    6969                        rpUnitsGetBasis.mexglx \
    7070                        rpUnitsFind.mexglx \
    71                         rpUnitsMakeMetric.mexglx \
    7271                        rpUnitsConvert.mexglx \
    7372                        rpUnitsConvertStr.mexglx \
    … …  
    141140rpUnitsFind.mexglx:
    142141        $(MEX) rpUnitsFind.cc             $(MATLAB_COMP_ARGS)
    143 rpUnitsMakeMetric.mexglx:
    144         $(MEX) rpUnitsMakeMetric.cc       $(MATLAB_COMP_ARGS)
    145142rpUnitsConvert.mexglx:
    146143        $(MEX) rpUnitsConvert.cc          $(MATLAB_COMP_ARGS)

  • trunk/src/octave/Makefile.in

    r520 r569  
    6969                        rpUnitsGetUnits.oct \
    7070                        rpUnitsGetUnitsName.oct \
    71                         rpUnitsGetMakeMetric.oct
    7271
    7372rpAddPresets.oct:
    … …  
    133132rpUnitsGetUnitsName.oct:
    134133        $(OCT) rpUnitsGetUnitsName.cc     $(OCTAVE_COMP_ARGS)
    135 rpUnitsGetMakeMetric.oct:
    136         $(OCT) rpUnitsMakeMetric.cc       $(OCTAVE_COMP_ARGS)
    137134
    138135docs:
Note: See TracChangeset for help on using the changeset viewer.