Rboolean -> bool

git-svn-id: https://svn.r-project.org/R/trunk@87899 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

src/include/Defn.h

@@ -2146,7 +2146,7 @@ void R_getProcTime(double *data);
 Rboolean R_isMissing(SEXP symbol, SEXP rho);
 Rboolean R_missing(SEXP symbol, SEXP rho);
 const char *sexptype2char(SEXPTYPE type);
-void sortVector(SEXP, Rboolean);
+void sortVector(SEXP, bool);
 void SrcrefPrompt(const char *, SEXP);
 void ssort(SEXP*,int);
 int StrToInternal(const char *);
@@ -2265,8 +2265,8 @@ const char *EncodeChar(SEXP);
 int mbrtoint(int *w, const char *s);
 
 /* main/sort.c */
-void orderVector1(int *indx, int n, SEXP key, Rboolean nalast,
-		  Rboolean decreasing, SEXP rho);
+void orderVector1(int *indx, int n, SEXP key, bool nalast,
+		  bool decreasing, SEXP rho);
 
 /* main/subset.c */
 SEXP R_subset3_dflt(SEXP, SEXP, SEXP);
@@ -2428,6 +2428,7 @@ extern void *alloca(size_t);
 
 /* int_fast64_t is required by C99/C11
    Alternative would be to use intmax_t.
+   Used in summary.c
  */
 #ifdef HAVE_INT64_T
 # define LONG_INT int64_t

src/main/envir.c

@@ -3048,7 +3048,7 @@ attribute_hidden SEXP do_env2list(SEXP call, SEXP op, SEXP args, SEXP rho)
 	SEXP sind = PROTECT(allocVector(INTSXP, k));
 	int *indx = INTEGER(sind);
 	for (int i = 0; i < k; i++) indx[i] = i;
-	orderVector1(indx, k, names, /* nalast */ TRUE, /* decreasing */ FALSE,
+	orderVector1(indx, k, names, /* nalast */ true, /* decreasing */ false,
 		     R_NilValue);
 	SEXP ans2   = PROTECT(allocVector(VECSXP, k));
 	SEXP names2 = PROTECT(allocVector(STRSXP, k));

src/main/options.c

@@ -514,7 +514,7 @@ attribute_hidden SEXP do_options(SEXP call, SEXP op, SEXP args, SEXP rho)
 	SEXP sind = PROTECT(allocVector(INTSXP, n));
 	int *indx = INTEGER(sind);
 	for (int i = 0; i < n; i++) indx[i] = i;
-	orderVector1(indx, n, names, TRUE, FALSE, R_NilValue);
+	orderVector1(indx, n, names, true, false, R_NilValue);
 	SEXP value2 = PROTECT(allocVector(VECSXP, n));
 	SEXP names2 = PROTECT(allocVector(STRSXP, n));
 	for(int i = 0; i < n; i++) {