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

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

Author: romain
Date: 2010-02-12 15:06:58 +0100 (Fri, 12 Feb 2010)
New Revision: 664

Modified:
   pkg/inst/ChangeLog
   pkg/src/Environment.cpp
   pkg/src/Rcpp/Environment.h
Log:
default constructor for Environment

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-02-12 04:29:32 UTC (rev 663)
+++ pkg/inst/ChangeLog	2010-02-12 14:06:58 UTC (rev 664)
@@ -1,3 +1,8 @@
+2010-02-12  Romain Francois <romain at r-enthusiasts.com>
+
+	* src/Rcpp/Environment.h: Environment gains a default
+	constructor. This is needed for RInside.
+
 2010-02-10  Romain Francois <romain at r-enthusiasts.com>
 
 	* src/Rcpp/SEXP_Vector.h: SEXP_Vector (and therefore

Modified: pkg/src/Environment.cpp
===================================================================
--- pkg/src/Environment.cpp	2010-02-12 04:29:32 UTC (rev 663)
+++ pkg/src/Environment.cpp	2010-02-12 14:06:58 UTC (rev 664)
@@ -23,6 +23,8 @@
 
 namespace Rcpp {
 
+    Environment::Environment() : RObject(R_NilValue){}
+
     Environment::Environment( SEXP x = R_GlobalEnv) throw(not_compatible) : RObject(x){
     	if( ! Rf_isEnvironment(x) ) {
     		/* not an environment, but maybe convertible to one using 
@@ -237,8 +239,8 @@
     
     
     
-    Environment::Binding::Binding( Environment& env, const std::string& name): 
-    	env(env), name(name){}
+    Environment::Binding::Binding( Environment& env_, const std::string& name_): 
+    	env(env_), name(name_){}
     
     bool Environment::Binding::active() const{
     	return env.bindingIsActive( name ) ; 

Modified: pkg/src/Rcpp/Environment.h
===================================================================
--- pkg/src/Rcpp/Environment.h	2010-02-12 04:29:32 UTC (rev 663)
+++ pkg/src/Rcpp/Environment.h	2010-02-12 14:06:58 UTC (rev 664)
@@ -258,6 +258,8 @@
     
     friend class Binding ;
     
+    Environment() ;
+    
     /**
      * wraps the given environment
      *