Author: edd Date: 2010-01-06 17:34:19 +0100 (Wed, 06 Jan 2010) New Revision: 287 Modified: pkg/src/RcppCommon.h Log: protect logTxt by #ifndef to no re-define if know (which helps suppress a warning for RInside) Modified: pkg/src/RcppCommon.h =================================================================== --- pkg/src/RcppCommon.h 2010-01-06 10:39:22 UTC (rev 286) +++ pkg/src/RcppCommon.h 2010-01-06 16:34:19 UTC (rev 287) @@ -63,8 +63,10 @@ // simple logging help inline void logTxtFunction(const char* file, const int line, const char* expression); +#ifndef logTxT //#define logTxt(x) logTxtFunction(__FILE__, __LINE__, x); #define logTxt(x) +#endif /* in exceptions.cpp */ void forward_uncaught_exceptions_to_r() ; _______________________________________________ Rcpp-commits mailing list Rcpp-commits at lists.r-forge.r-project.org https://lists.r-forge.r-project.org/cgi-bin/mailman/listinfo/rcpp-commits
[Rcpp-devel] [Rcpp-commits] r287 - pkg/src
1 message · noreply at r-forge.r-project.org