Changeset 3739 for branches/1.3/lang/R/Rappture/src/RpLibraryRInterface.cc
- Timestamp:
- Jul 3, 2013, 8:39:28 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.3/lang/R/Rappture/src/RpLibraryRInterface.cc
r3177 r3739 24 24 rp_lib_finalizer(SEXP ptr) 25 25 { 26 RpLibrary* lib = NULL;27 26 if (!R_ExternalPtrAddr(ptr)) { 28 27 return; 29 28 } 30 lib = (RpLibrary *) R_ExternalPtrAddr(ptr); 29 #ifdef notdef 30 /* Until we figure this out, don't delete the library object. R is 31 * calling the finalizer on every method of the library object. This is a 32 * problem only if someone explicitly deletes the library object from 33 * R. */ 34 RpLibrary* lib; 35 lib = (RpLibrary *)R_ExternalPtrAddr(ptr); 31 36 if (lib != NULL) { 32 37 delete lib; 33 lib = NULL;34 } 38 } 39 #endif 35 40 R_ClearExternalPtr(ptr); 36 37 41 } 38 42 … … 92 96 SEXP path) // null terminated path 93 97 { 94 RpLibrary* lib = NULL;98 RpLibrary* lib; 95 99 SEXP ans; 96 100 int handleVal = -1; … … 123 127 124 128 lib = (RpLibrary*) getObject_Void(handleVal); 125 126 129 if (lib == NULL) { 127 130 error("invalid Rappture Library Object");
Note: See TracChangeset
for help on using the changeset viewer.