[Rcpp-commits] r2934 - in pkg/Rcpp: . inst/unitTests/testRcppModule/src

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

Author: edd
Date: 2011-04-02 20:06:08 +0200 (Sat, 02 Apr 2011)
New Revision: 2934

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/unitTests/testRcppModule/src/stdVector.cpp
Log:
fix the fix to modules client package


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2011-04-02 17:05:45 UTC (rev 2933)
+++ pkg/Rcpp/ChangeLog	2011-04-02 18:06:08 UTC (rev 2934)
@@ -1,5 +1,7 @@
 2011-04-02  Dirk Eddelbuettel  <edd at debian.org>
 
+	* inst/unitTests/testRcppModule/src/stdVector.cpp: Use #ifdef not #if
+
 	* inst/include/Rcpp/module/Module_generated_ctor_signatureh: Add a
 	bit of null-op code to suppress a 'unused parameter' warning in the
 	initial (and non-templated) ctor_signature() function

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2011-04-02 17:05:45 UTC (rev 2933)
+++ pkg/Rcpp/DESCRIPTION	2011-04-02 18:06:08 UTC (rev 2934)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.9.2.1
+Version: 0.9.2.2
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, 
  with contributions by Douglas Bates and John Chambers

Modified: pkg/Rcpp/inst/unitTests/testRcppModule/src/stdVector.cpp
===================================================================
--- pkg/Rcpp/inst/unitTests/testRcppModule/src/stdVector.cpp	2011-04-02 17:05:45 UTC (rev 2933)
+++ pkg/Rcpp/inst/unitTests/testRcppModule/src/stdVector.cpp	2011-04-02 18:06:08 UTC (rev 2934)
@@ -37,7 +37,7 @@
     .method( "capacity", &vec::capacity)
     .method( "empty", &vec::empty)
     .method( "reserve", &vec::reserve)
-#if IS_GCC_450_OR_LATER
+#ifdef IS_GCC_450_OR_LATER
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
       // cf C++ header file bits/stl_vector.h
     .method( "push_back", &vec::push_back )