Commit 13d6544b authored by Radford Neal's avatar Radford Neal

Merge branch '89' into 89-gradient

parents 408075e3 2c82968e
......@@ -1636,7 +1636,7 @@ LibExtern SEXP R_UnboundValue; /* Variable form, for those that need it */
/* Set in const-objs.c, as done below */
#if USE_COMPRESSED_POINTERS
#define R_UnboundValue ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,0))
#define R_UnboundValue ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,0*SGGC_SYM_CHUNKS))
#else
#define R_UnboundValue ((SEXP) &R_sym_consts[0]) /* for sym with no value */
#endif
......@@ -1647,7 +1647,7 @@ LibExtern SEXP R_MissingArg; /* Variable form, for those that need it */
/* Set in const-objs.c, as done below */
#if USE_COMPRESSED_POINTERS
#define R_MissingArg ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,1))
#define R_MissingArg ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,1*SGGC_SYM_CHUNKS))
#else
#define R_MissingArg ((SEXP) &R_sym_consts[1])
#endif
......@@ -1656,7 +1656,7 @@ LibExtern SEXP R_MissingUnder; /* Variable form, for those that need it */
/* Set in const-objs.c, as done below */
#if USE_COMPRESSED_POINTERS
#define R_MissingUnder ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,2))
#define R_MissingUnder ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,2*SGGC_SYM_CHUNKS))
#else
#define R_MissingUnder ((SEXP) &R_sym_consts[2])
#endif
......
......@@ -708,7 +708,7 @@ void InitNames()
PRINTNAME(R_MissingArg) = R_BlankString;
IS_PRINTNAME(R_BlankString) = 1;
SET_SYMVALUE(R_MissingArg, R_MissingArg);
# if !USE_AUX_FOR_ATTRIB
# if !USE_AUX_FOR_ATTRIB && !USE_COMPRESSED_POINTERS
LENGTH(R_MissingArg) = 1;
# endif
......@@ -717,8 +717,8 @@ void InitNames()
PRINTNAME(R_MissingUnder) = R_UnderscoreString;
IS_PRINTNAME(R_UnderscoreString) = 1;
SET_SYMVALUE(R_MissingUnder, R_MissingArg);
# if !USE_AUX_FOR_ATTRIB
LENGTH(R_MissingUnder) = 1;
# if !USE_AUX_FOR_ATTRIB && !USE_COMPRESSED_POINTERS
LENGTH(R_MissingArg) = 1;
# endif
/* R_RestartToken */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment