[Lme4-commits] r1528 - pkg/lme4Eigen/src

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

Author: bbolker
Date: 2012-01-27 23:54:47 +0100 (Fri, 27 Jan 2012)
New Revision: 1528

Modified:
   pkg/lme4Eigen/src/external.cpp
Log:

  cast NelderMead_evals return value to int in order to compile on Windows




Modified: pkg/lme4Eigen/src/external.cpp
===================================================================
--- pkg/lme4Eigen/src/external.cpp	2012-01-27 22:34:48 UTC (rev 1527)
+++ pkg/lme4Eigen/src/external.cpp	2012-01-27 22:54:47 UTC (rev 1528)
@@ -749,7 +749,7 @@
 				// return the number of function evaluations performed
     SEXP NelderMead_evals(SEXP ptr_) { 
 	BEGIN_RCPP;
-	return wrap(XPtr<Nelder_Mead>(ptr_)->evals());
+	return wrap(int(XPtr<Nelder_Mead>(ptr_)->evals()));
 	END_RCPP;
     }