diff --git a/ChangeLog b/ChangeLog index 553f0a1..c17b17d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,7 +134,7 @@ Version 0.17.1 (2019-6-24) Version 0.16.3 (2019-6-21) * Use hash checksums for checking file integrity using the `xxhash` library * New parameter: `qsave` -- `check_hash`, computes a checksum on the serialized data - * New paramter: `qread` -- `strict`, throws an error if checksum does not pre-computed value + * New parameter: `qread` -- `strict`, throws an error if checksum does not pre-computed value * `qdump` function reports checksums * Performance optimizations -- use C interface directly rather than Rcpp containers * About 180% serialization speed improvement for large lists (e.g., `as.list(runif(1e6))`) diff --git a/src/qs_serialize_common.h b/src/qs_serialize_common.h index 0f530ff..a0fc06a 100644 --- a/src/qs_serialize_common.h +++ b/src/qs_serialize_common.h @@ -358,9 +358,9 @@ void writeObject(T * const sobj, SEXP x) { // evaluate promises immediately if(!trust_promises_global) { if(TYPEOF(x) == PROMSXP) { - int error_occured = 0; - SEXP xeval = R_tryEval(x, R_BaseEnv, &error_occured); - if(error_occured) { + int error_occurred = 0; + SEXP xeval = R_tryEval(x, R_BaseEnv, &error_occurred); + if(error_occurred) { writeObject(sobj, R_NilValue); } else { PROTECT(xeval);