[Rcpp-commits] r1260 - in pkg/RcppArmadillo/inst: . include include/armadillo_bits

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

Author: romain
Date: 2010-05-17 22:57:10 +0200 (Mon, 17 May 2010)
New Revision: 1260

Added:
   pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
Modified:
   pkg/RcppArmadillo/inst/ChangeLog
   pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp
Log:
workaround for win64

Modified: pkg/RcppArmadillo/inst/ChangeLog
===================================================================
--- pkg/RcppArmadillo/inst/ChangeLog	2010-05-17 18:13:15 UTC (rev 1259)
+++ pkg/RcppArmadillo/inst/ChangeLog	2010-05-17 20:57:10 UTC (rev 1260)
@@ -1,3 +1,7 @@
+2010-05-17   Romain Francois <romain at r-enthusiasts.com>
+
+	* inst/include/RcppArmadillo.h: workaround for win64
+
 2010-05-13  Dirk Eddelbuettel  <edd at dexter>
 
 	* R/fastLm.R: fastLm() is now generic and has a formula interface as

Added: pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	                        (rev 0)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2010-05-17 20:57:10 UTC (rev 1260)
@@ -0,0 +1,31 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// RcppArmadilloConfig.h: Rcpp/Armadillo glue
+//
+// Copyright (C)  2010 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+//
+// This file is part of RcppArmadillo.
+//
+// RcppArmadillo is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// RcppArmadillo is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef RcppArmadillo__RcppArmadilloConfig__h
+#define RcppArmadillo__RcppArmadilloConfig__h
+
+/* TODO: we might need to undef this on other platforms as well */
+#if defined(__GNUC__) && defined(_WIN64)
+#undef ARMA_HAVE_STD_SNPRINTF
+#endif
+
+#endif
+

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp	2010-05-17 18:13:15 UTC (rev 1259)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp	2010-05-17 20:57:10 UTC (rev 1260)
@@ -43,3 +43,6 @@
     #define ARMA_ATLAS_INCLUDE_DIR  /usr/include
   #endif
 #endif
+
+#include <RcppArmadilloConfig.h>
+