[Rcpp-commits] r545 - in pkg/src: . Rcpp

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

Author: romain
Date: 2010-02-01 17:48:42 +0100 (Mon, 01 Feb 2010)
New Revision: 545

Modified:
   pkg/src/Environment.cpp
   pkg/src/Rcpp/XPtr.h
   pkg/src/Symbol.cpp
Log:
trying to please suncc

Modified: pkg/src/Environment.cpp
===================================================================
--- pkg/src/Environment.cpp	2010-02-01 16:39:33 UTC (rev 544)
+++ pkg/src/Environment.cpp	2010-02-01 16:48:42 UTC (rev 545)
@@ -23,7 +23,7 @@
 
 namespace Rcpp {
 
-    Environment::Environment( SEXP x = R_GlobalEnv) throw(not_compatible) : RObject::RObject(x){
+    Environment::Environment( SEXP x = R_GlobalEnv) throw(not_compatible) : RObject(x){
     	if( ! Rf_isEnvironment(x) ) {
     		/* not an environment, but maybe convertible to one using 
     		   as.environment, try that */

Modified: pkg/src/Rcpp/XPtr.h
===================================================================
--- pkg/src/Rcpp/XPtr.h	2010-02-01 16:39:33 UTC (rev 544)
+++ pkg/src/Rcpp/XPtr.h	2010-02-01 16:48:42 UTC (rev 545)
@@ -43,7 +43,7 @@
      *
      * @param xp external pointer to wrap
      */
-    explicit XPtr(SEXP m_sexp) : RObject::RObject(m_sexp){} ;
+    explicit XPtr(SEXP m_sexp) : RObject(m_sexp){} ;
 		
     /**
      * creates a new external pointer wrapping the dumb pointer p. 

Modified: pkg/src/Symbol.cpp
===================================================================
--- pkg/src/Symbol.cpp	2010-02-01 16:39:33 UTC (rev 544)
+++ pkg/src/Symbol.cpp	2010-02-01 16:48:42 UTC (rev 545)
@@ -23,7 +23,7 @@
 
 namespace Rcpp {
 
-	Symbol::Symbol( SEXP x ) throw(not_compatible) : RObject::RObject() {
+	Symbol::Symbol( SEXP x ) throw(not_compatible) : RObject() {
 		if( x != R_NilValue ){
 			int type = TYPEOF(x) ;
 			switch( type ){