Changeset 1085 for trunk/lang/matlab


Ignore:
Timestamp:
Aug 3, 2008 11:08:42 PM (14 years ago)
Author:
dkearney
Message:

adjusting matlab and octave bindings to use the void* bindings dictionary instead of the lib* dictionary in hopes that we can phase out the lib* dictionary.

Location:
trunk/lang/matlab
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/lang/matlab/rpLib.cc

    r962 r1085  
    4343    if (lib) {
    4444        // store the library and return a dictionary key
    45         libIndex = storeObject_Lib(lib);
     45        libIndex = storeObject_Void((void*)lib);
    4646        if (libIndex) {
    4747            err = 0;

  • trunk/lang/matlab/rpLibChildren.cc

    r162 r1085  
    5757         (childIndex >= 0)      ) {
    5858
    59         lib = getObject_Lib(libIndex);
     59        lib = (RpLibrary*) getObject_Void(libIndex);
    6060
    6161        if (childIndex > 0) {
    62             child = getObject_Lib(childIndex);
     62            child = (RpLibrary*) getObject_Void(childIndex);
    6363        }
    6464
    6565        if (lib) {
    6666            retLib = lib->children(path,child);
    67             retLibIndex = storeObject_Lib(retLib);
     67            retLibIndex = storeObject_Void((void*)retLib);
    6868            if (retLibIndex) {
    6969                err = 0;

  • trunk/lang/matlab/rpLibChildrenByType.cc

    r162 r1085  
    5656    /* Call the C++ subroutine. */
    5757    if ( (libIndex > 0) && (!path.empty()) && (!type.empty()) ) {
    58         lib = getObject_Lib(libIndex);
     58        lib = (RpLibrary*) getObject_Void(libIndex);
    5959
    6060        if (childIndex > 0) {
    61             child = getObject_Lib(childIndex);
     61            child = (RpLibrary*) getObject_Void(childIndex);
    6262        }
    6363
    6464        if (lib) {
    6565            retLib = lib->children(path,child,type);
    66             retLibIndex = storeObject_Lib(retLib);
     66            retLibIndex = storeObject_Void((void*)retLib);
    6767            if (retLibIndex) {
    6868                err = 0;

  • trunk/lang/matlab/rpLibElement.cc

    r162 r1085  
    4949    /* Call the C++ subroutine. */
    5050    if ( (libIndex > 0) && (!path.empty()) ) {
    51         lib = getObject_Lib(libIndex);
     51        lib = (RpLibrary*) getObject_Void(libIndex);
    5252        if (lib) {
    5353            retLib = lib->element(path);
    54             retLibIndex = storeObject_Lib(retLib);
     54            retLibIndex = storeObject_Void((void*)retLib);
    5555            if (retLibIndex) {
    5656                err = 0;

  • trunk/lang/matlab/rpLibElementAsComp.cc

    r162 r1085  
    4949    /* Call the C++ subroutine. */
    5050    if ( (libIndex > 0) && (!path.empty()) ) {
    51         lib = getObject_Lib(libIndex);
     51        lib = (RpLibrary*) getObject_Void(libIndex);
    5252        if (lib) {
    5353            eleLib = lib->element(path);

  • trunk/lang/matlab/rpLibElementAsId.cc

    r162 r1085  
    5050    /* Call the C subroutine. */
    5151    if ( (libIndex > 0) && (!path.empty()) ) {
    52         lib = getObject_Lib(libIndex);
     52        lib = (RpLibrary*) getObject_Void(libIndex);
    5353        if (lib) {
    5454            eleLib = lib->element(path);

  • trunk/lang/matlab/rpLibElementAsObject.cc

    r162 r1085  
    4949    /* Call the C++ subroutine. */
    5050    if ( (libIndex > 0) && (!path.empty()) ) {
    51         lib = getObject_Lib(libIndex);
     51        lib = (RpLibrary*) getObject_Void(libIndex);
    5252        if (lib) {
    5353            retLib = lib->element(path);
    54             retLibIndex = storeObject_Lib(retLib);
     54            retLibIndex = storeObject_Void((void*)retLib);
    5555            if (retLibIndex) {
    5656                err = 0;

  • trunk/lang/matlab/rpLibElementAsType.cc

    r162 r1085  
    5050    /* Call the C++ subroutine. */
    5151    if ( (libIndex > 0) && (!path.empty()) ) {
    52         lib = getObject_Lib(libIndex);
     52        lib = (RpLibrary*) getObject_Void(libIndex);
    5353        if (lib) {
    5454            eleLib = lib->element(path);

  • trunk/lang/matlab/rpLibGet.cc

    r162 r1085  
    4848    /* Call the C subroutine. */
    4949    if ( (libIndex > 0) && (!path.empty()) ) {
    50         lib = getObject_Lib(libIndex);
     50        lib = (RpLibrary*) getObject_Void(libIndex);
    5151
    5252        if (lib) {

  • trunk/lang/matlab/rpLibGetDouble.cc

    r165 r1085  
    4848    /* Call the C subroutine. */
    4949    if ( (libIndex > 0) && (!path.empty()) ) {
    50         lib = getObject_Lib(libIndex);
     50        lib = (RpLibrary*) getObject_Void(libIndex);
    5151
    5252        if (lib) {

  • trunk/lang/matlab/rpLibGetString.cc

    r162 r1085  
    4848    /* Call the C subroutine. */
    4949    if ( (libIndex > 0) && (!path.empty()) ) {
    50         lib = getObject_Lib(libIndex);
     50        lib = (RpLibrary*) getObject_Void(libIndex);
    5151
    5252        if (lib) {

  • trunk/lang/matlab/rpLibNodeComp.cc

    r162 r1085  
    4444    /* Call the C subroutine. */
    4545    if (libIndex > 0) {
    46         lib = getObject_Lib(libIndex);
     46        lib = (RpLibrary*) getObject_Void(libIndex);
    4747        if (lib) {
    4848            retStr = lib->nodeComp();

  • trunk/lang/matlab/rpLibNodeId.cc

    r162 r1085  
    4343    /* Call the C subroutine. */
    4444    if (libIndex > 0) {
    45         lib = getObject_Lib(libIndex);
     45        lib = (RpLibrary*) getObject_Void(libIndex);
    4646        if (lib) {
    4747            retStr = lib->nodeId();

  • trunk/lang/matlab/rpLibNodeType.cc

    r162 r1085  
    4444    /* Call the C subroutine. */
    4545    if (libIndex > 0) {
    46         lib = getObject_Lib(libIndex);
     46        lib = (RpLibrary*) getObject_Void(libIndex);
    4747        if (lib) {
    4848            retStr = lib->nodeComp();

  • trunk/lang/matlab/rpLibPut.cc

    r162 r1085  
    5454    /* Call the C++ subroutine. */
    5555    if ( (libIndex > 0) && (!path.empty()) ) {
    56         lib = getObject_Lib(libIndex);
     56        lib = (RpLibrary*) getObject_Void(libIndex);
    5757
    5858        if (lib) {

  • trunk/lang/matlab/rpLibPutData.cc

    r597 r1085  
    5858    /* Call the C++ subroutine. */
    5959    if ( (libIndex > 0) && (!path.empty()) ) {
    60         lib = getObject_Lib(libIndex);
     60        lib = (RpLibrary*) getObject_Void(libIndex);
    6161
    6262        if (lib) {

  • trunk/lang/matlab/rpLibPutDouble.cc

    r162 r1085  
    5555    /* Call the C subroutine. */
    5656    if ( (libIndex > 0) && (!path.empty()) ) {
    57         lib = getObject_Lib(libIndex);
     57        lib = (RpLibrary*) getObject_Void(libIndex);
    5858
    5959        if (lib) {

  • trunk/lang/matlab/rpLibPutFile.cc

    r597 r1085  
    5858    /* Call the C++ subroutine. */
    5959    if ( (libIndex > 0) && (!path.empty()) ) {
    60         lib = getObject_Lib(libIndex);
     60        lib = (RpLibrary*) getObject_Void(libIndex);
    6161
    6262        if (lib) {

  • trunk/lang/matlab/rpLibPutString.cc

    r162 r1085  
    5454    /* Call the C++ subroutine. */
    5555    if ( (libIndex > 0) && (!path.empty()) ) {
    56         lib = getObject_Lib(libIndex);
     56        lib = (RpLibrary*) getObject_Void(libIndex);
    5757
    5858        if (lib) {

  • trunk/lang/matlab/rpLibResult.cc

    r962 r1085  
    5151    /* Call the C subroutine. */
    5252    if (libIndex > 0) {
    53         lib = getObject_Lib(libIndex);
     53        lib = (RpLibrary*) getObject_Void(libIndex);
    5454        if (lib) {
    5555            lib->put("tool.version.rappture.language", "matlab");

  • trunk/lang/matlab/rpLibXml.cc

    r162 r1085  
    4343    /* Call the C subroutine. */
    4444    if (libIndex > 0) {
    45         lib = getObject_Lib(libIndex);
     45        lib = (RpLibrary*) getObject_Void(libIndex);
    4646        if (lib) {
    4747            retStr = lib->xml();
Note: See TracChangeset for help on using the changeset viewer.