[Rcpp-commits] r2380 - pkg/RcppDE/src

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

Author: edd
Date: 2010-10-31 23:52:58 +0100 (Sun, 31 Oct 2010)
New Revision: 2380

Modified:
   pkg/RcppDE/src/evaluate.cpp
Log:
add ifdef for OpenMP


Modified: pkg/RcppDE/src/evaluate.cpp
===================================================================
--- pkg/RcppDE/src/evaluate.cpp	2010-10-31 22:52:36 UTC (rev 2379)
+++ pkg/RcppDE/src/evaluate.cpp	2010-10-31 22:52:58 UTC (rev 2380)
@@ -5,6 +5,7 @@
 //
 // DEoptim is Copyright (C) 2009 David Ardia and Katharine Mullen
 
+#ifndef USE_OPENMP
 #include <RcppArmadillo.h>
 
 // Slighly accelerated version of evaluate to evaluate function fcall with parameters param in environment env
@@ -19,5 +20,4 @@
     l_nfeval++;  						   // increment function evaluation count 
     return(f_result); 
 }
-
-
+#endif