Changeset 1105 for trunk/src

Timestamp:

Aug 9, 2008, 10:00:58 AM (16 years ago)

Author:

dkearney

Message:

adding grabdata to makefiles, changes to use a generic dictionary for objects in fortran bindings, updates to fortran progress function

Location:

trunk/src/core

Files:

• RpLibraryFInterface.cc (modified) (5 diffs)
• RpUtilsFInterface.cc (modified) (1 diff)

trunk/src/core/RpLibraryFInterface.cc

@@ -35 +35 @@
 
     if (lib) {
-        handle = storeObject_Lib(lib);
+        handle = storeObject_Void((void*)lib);
     }
 
@@ -66 +66 @@
 
             if (retObj) {
-                newObjHandle = storeObject_Lib(retObj);
+                newObjHandle = storeObject_Void((void*)retObj);
             }
         }
@@ -198 +198 @@
             if (childNode) {
                 if (*childHandle < 1) {
-                    newObjHandle = storeObject_Lib(childNode);
+                    newObjHandle = storeObject_Void((void*)childNode);
                 }
                 else {
-                    newObjHandle = storeObject_Lib(childNode,*childHandle);
+                    newObjHandle = storeObject_Void((void*)childNode,*childHandle);
                 }
             }
@@ -415 +415 @@
                     // store the whole list,
                     // need to make a way to read the nodes
-                    newObjHandle = storeObject_Lib(list);
+                    newObjHandle = storeObject_Void((void*)list);
                     // Py_DECREF(list);
                 }
@@ -848 +848 @@
 
                 if (removedObj) {
-                    newObjHandle = storeObject_Lib(removedObj);
+                    newObjHandle = storeObject_Void((void*)removedObj);
                     // Py_DECREF(removedObj);
                 }

trunk/src/core/RpUtilsFInterface.cc

@@ -33 +33 @@
 {
     const char* inText;
+    int retVal;
     inText = null_terminate(text, text_len);
-    if (inText != NULL) {
-        return 1;
-    } 
-    int retVal;
     retVal = Rappture::Utils::progress(*percentPtr, inText);
     free((void*)inText);
+    inText = NULL;
     return retVal;
 }