Changeset 3741 for trunk/lang/R
- Timestamp:
- Jul 3, 2013, 9:10:00 AM (11 years ago)
- Location:
- trunk/lang/R
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lang/R/Makefile.in
r3725 r3741 21 21 R = @R@ 22 22 23 coresrcdir = ${PWD}/ ../../rappture/src/core24 corelibdir = ${PWD}/../ src/core25 R_flags = --configure-args='--with-rappture-include=$( includedir)\26 --with-rappture-lib=$( libdir)'23 coresrcdir = ${PWD}/$(srcdir)/../../src/core 24 corelibdir = ${PWD}/../../src/core 25 R_flags = --configure-args='--with-rappture-include=$(coresrcdir) \ 26 --with-rappture-lib=$(corelibdir)' 27 27 28 28 RLIB = R -
trunk/lang/R/Rappture/man/Rappture-package.Rd
r2709 r3741 31 31 ~~ Literature or other references for background information ~~ 32 32 } 33 ~~ Optionally other standard keywords, one per line, from file KEYWORDS in ~~34 ~~ the R documentation directory ~~35 33 \keyword{ package } 36 34 \seealso{ -
trunk/lang/R/Rappture/src/RpLibraryRInterface.cc
r3177 r3741 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.