renamed reserved identifiers

Author: badasahog

src/assign.c

@@ -320,7 +320,7 @@ SEXP selfrefokwrapper(SEXP x, SEXP verbose) {
   return ScalarInteger(_selfrefok(x,FALSE,LOGICAL(verbose)[0]));
 }
 
-int *_Last_updated = NULL;
+int *Last_updated_ = NULL;
 
 SEXP assign(SEXP dt, SEXP rows, SEXP cols, SEXP newcolnames, SEXP values)
 {
@@ -381,7 +381,7 @@ SEXP assign(SEXP dt, SEXP rows, SEXP cols, SEXP newcolnames, SEXP values)
     if (numToDo==0) {
       // isString(cols) is exclusive to calls from set()
       if (!length(newcolnames) && !isString(cols)) {
-        *_Last_updated = 0;
+        *Last_updated_ = 0;
         UNPROTECT(protecti);
         return(dt); // all items of rows either 0 or NA. !length(newcolnames) for #759
       }
@@ -393,7 +393,7 @@ SEXP assign(SEXP dt, SEXP rows, SEXP cols, SEXP newcolnames, SEXP values)
   }
   if (!length(cols)) {
     if (verbose) Rprintf(_("length(LHS)==0; no columns to delete or assign RHS to."));   // test 1295 covers
-    *_Last_updated = 0;
+    *Last_updated_ = 0;
     UNPROTECT(protecti);
     return(dt);
   }
@@ -582,7 +582,7 @@ SEXP assign(SEXP dt, SEXP rows, SEXP cols, SEXP newcolnames, SEXP values)
     if (ret) warning("%s", ret); // # notranslate
   }
 
-  *_Last_updated = numToDo;  // the updates have taken place with no error, so update .Last.updated now
+  *Last_updated_ = numToDo;  // the updates have taken place with no error, so update .Last.updated now
   assignedNames = PROTECT(allocVector(STRSXP, LENGTH(cols))); protecti++;
   for (int i=0; i<LENGTH(cols); ++i) SET_STRING_ELT(assignedNames,i,STRING_ELT(names,INTEGER(cols)[i]-1));
   key = getAttrib(dt, sym_sorted);

src/data.table.h

@@ -46,8 +46,8 @@
 #define IS_FALSE(x) (TYPEOF(x)==LGLSXP && LENGTH(x)==1 && LOGICAL(x)[0]==FALSE)
 #define IS_TRUE_OR_FALSE(x) (TYPEOF(x)==LGLSXP && LENGTH(x)==1 && LOGICAL(x)[0]!=NA_LOGICAL)
 
-#define SIZEOF(x) __sizes[TYPEOF(x)]
-#define TYPEORDER(x) __typeorder[x]
+#define SIZEOF(x) sizes__[TYPEOF(x)]
+#define TYPEORDER(x) typeorder__[x]
 
 #ifdef MIN
 #  undef MIN
@@ -120,8 +120,8 @@ extern SEXP sym_as_posixct;
 extern double NA_INT64_D;
 extern long long NA_INT64_LL;
 extern Rcomplex NA_CPLX;  // initialized in init.c; see there for comments
-extern size_t __sizes[100];     // max appears to be FUNSXP = 99, see Rinternals.h
-extern size_t __typeorder[100]; // __ prefix otherwise if we use these names directly, the SIZEOF define ends up using the local one
+extern size_t sizes__[100];     // max appears to be FUNSXP = 99, see Rinternals.h
+extern size_t typeorder__[100]; // __ prefix otherwise if we use these names directly, the SIZEOF define ends up using the local one
 
 long long DtoLL(double x);
 double LLtoD(long long x);