[Rcpp-commits] r423 - in pkg: inst src src/Rcpp

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

Author: romain
Date: 2010-01-22 14:55:32 +0100 (Fri, 22 Jan 2010)
New Revision: 423

Modified:
   pkg/inst/ChangeLog
   pkg/src/ExpressionVector.cpp
   pkg/src/Rcpp/ExpressionVector.h
Log:
make sure what() is const

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-01-22 13:35:06 UTC (rev 422)
+++ pkg/inst/ChangeLog	2010-01-22 13:55:32 UTC (rev 423)
@@ -1,3 +1,9 @@
+2010-01-22  Romain Francois <francoisromain at free.fr>
+
+	* src/Makevars.win: disable c++0x entirely (for now)
+
+	* src/Rcpp/Environment.h: make sure what() is const. (suncc finding)
+
 2010-01-21  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.7.3

Modified: pkg/src/ExpressionVector.cpp
===================================================================
--- pkg/src/ExpressionVector.cpp	2010-01-22 13:35:06 UTC (rev 422)
+++ pkg/src/ExpressionVector.cpp	2010-01-22 13:55:32 UTC (rev 423)
@@ -30,7 +30,7 @@
 	
 	ExpressionVector::parse_error::parse_error() throw(){}
 	ExpressionVector::parse_error::~parse_error() throw(){}
-	const char* ExpressionVector::parse_error::what() throw(){ return "parse error" ; }
+	const char* ExpressionVector::parse_error::what() const throw(){ return "parse error" ; }
 	
 	ExpressionVector::ExpressionVector(SEXP x) throw(not_compatible) : VectorBase() {
 		switch( TYPEOF( x ) ){

Modified: pkg/src/Rcpp/ExpressionVector.h
===================================================================
--- pkg/src/Rcpp/ExpressionVector.h	2010-01-22 13:35:06 UTC (rev 422)
+++ pkg/src/Rcpp/ExpressionVector.h	2010-01-22 13:55:32 UTC (rev 423)
@@ -41,7 +41,7 @@
 	public:
 		parse_error() throw();
 		virtual ~parse_error() throw();
-	        virtual const char* /*const*/ what() throw() ;
+	        virtual const char* what() const throw() ;
 	} ;
 	
 	/* much inspired from item 30 of more effective C++ */