[Rcpp-commits] r2067 - in pkg/Rcpp: inst/include inst/include/Rcpp src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2010-09-03 04:57:32 +0200 (Fri, 03 Sep 2010)
New Revision: 2067

Modified:
   pkg/Rcpp/inst/include/Rcpp/XPtr.h
   pkg/Rcpp/inst/include/RcppCommon.h
   pkg/Rcpp/src/Date.cpp
Log:
undoing msvc part 3

Modified: pkg/Rcpp/inst/include/Rcpp/XPtr.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/XPtr.h	2010-09-03 02:55:34 UTC (rev 2066)
+++ pkg/Rcpp/inst/include/Rcpp/XPtr.h	2010-09-03 02:57:32 UTC (rev 2067)
@@ -59,11 +59,7 @@
      *        so you need to make sure the pointer can be "delete" d
      *        this way (has to be a C++ object)
      */
-#ifdef _MSC_VER
-    explicit XPtr(T* p, bool set_delete_finalizer, SEXP tag = R_NilValue, SEXP prot = R_NilValue) ;
-#else
-    explicit XPtr(T* p, bool set_delete_finalizer, SEXP tag, SEXP prot) ;
-#endif
+    explicit XPtr(T* p, bool set_delete_finalizer, SEXP tag, SEXP prot);
 
     XPtr( const XPtr& other ) : RObject( other.asSexp() ) {}
     

Modified: pkg/Rcpp/inst/include/RcppCommon.h
===================================================================
--- pkg/Rcpp/inst/include/RcppCommon.h	2010-09-03 02:55:34 UTC (rev 2066)
+++ pkg/Rcpp/inst/include/RcppCommon.h	2010-09-03 02:57:32 UTC (rev 2067)
@@ -121,11 +121,6 @@
 #define RcppExport extern "C"
 // #endif
 
-#ifdef _MSC_VER
-#define snprintf _snprintf
-#include <Rcpp/msvc/math.h>
-#endif
-
 #include <Rcpp/internal/posixt.h>
 
 namespace Rcpp{

Modified: pkg/Rcpp/src/Date.cpp
===================================================================
--- pkg/Rcpp/src/Date.cpp	2010-09-03 02:55:34 UTC (rev 2066)
+++ pkg/Rcpp/src/Date.cpp	2010-09-03 02:57:32 UTC (rev 2067)
@@ -29,12 +29,6 @@
 #include <Rcpp/Function.h>
 #include <time.h>		// for gmtime
 
-#ifdef _MSC_VER /* not included with MSVC 2008 or MSVC 2010 */
-#include <Rcpp/msvc/unistd.h>
-#else
-#include <unistd.h>		// for read and close on Solaris
-#endif
-
 namespace Rcpp {
 
     static struct tm * gmtime_(const time_t * const	timep); // see below
@@ -183,11 +177,7 @@
 
 #include "stdlib.h"
 
-#if defined(_MSC_VER) && _MSC_VER < 1600 /* missing from MSVC 2008 (1500), present with MSVC 2010 (1600) */
-#include "msvc/stdint.h"
-#else
 #include "stdint.h"
-#endif
 #include "stdio.h"
 #include "fcntl.h"
 #include "float.h"	/* for FLT_MAX and DBL_MAX */