[Rcpp-commits] r2122 - in pkg/Rcpp: R inst/include/Rcpp src

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

Author: romain
Date: 2010-09-16 21:00:21 +0200 (Thu, 16 Sep 2010)
New Revision: 2122

Modified:
   pkg/Rcpp/R/00_classes.R
   pkg/Rcpp/R/Module.R
   pkg/Rcpp/inst/include/Rcpp/Reference.h
   pkg/Rcpp/src/Module.cpp
   pkg/Rcpp/src/Reference.cpp
Log:
conflicting setClass calls

Modified: pkg/Rcpp/R/00_classes.R
===================================================================
--- pkg/Rcpp/R/00_classes.R	2010-09-16 18:39:37 UTC (rev 2121)
+++ pkg/Rcpp/R/00_classes.R	2010-09-16 19:00:21 UTC (rev 2122)
@@ -47,7 +47,7 @@
 	contains = "character"
 	)
 setClass( "C++ClassRepresentation", 
-    representation( pointer = "externalptr" ), 
+    representation( pointer = "externalptr", generator = "refObjectGenerator" ), 
     contains = "classRepresentation" )
 
 # might not actually use this

Modified: pkg/Rcpp/R/Module.R
===================================================================
--- pkg/Rcpp/R/Module.R	2010-09-16 18:39:37 UTC (rev 2121)
+++ pkg/Rcpp/R/Module.R	2010-09-16 19:00:21 UTC (rev 2122)
@@ -23,29 +23,6 @@
 }
 
 ## setGeneric( "new" )
-
-## "Module" class as an environment with "pointer", "moduleName", and "packageName"
-## Stands in for a reference class with those fields.
-setClass( "Module",  contains = "environment" )
-setClass( "C++Class", 
-	representation( pointer = "externalptr", module = "externalptr" ), 
-	contains = "character"
-	)
-setClass( "C++ClassRepresentation", 
-    representation( pointer = "externalptr", generator = "refObjectGenerator" ), 
-    contains = "classRepresentation" )
-setClass( "C++Property" )	
-setClass( "C++Object", 
-	representation( 
-		module = "externalptr", 
-		cppclass = "externalptr", 
-		pointer = "externalptr"
-		)
-	)
-setClass( "C++Function", 
-	representation( pointer = "externalptr" ), 
-	contains = "function"
-)
      
 internal_function <- function(pointer){
 	f <- function(xp){

Modified: pkg/Rcpp/inst/include/Rcpp/Reference.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Reference.h	2010-09-16 18:39:37 UTC (rev 2121)
+++ pkg/Rcpp/inst/include/Rcpp/Reference.h	2010-09-16 19:00:21 UTC (rev 2122)
@@ -1,6 +1,6 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 4 -*-
 //
-// S4.h: Rcpp R/C++ interface class library -- S4 objects
+// Reference.h: Rcpp R/C++ interface class library -- S4 objects
 //
 // Copyright (C) 2010	Dirk Eddelbuettel and Romain Francois
 //

Modified: pkg/Rcpp/src/Module.cpp
===================================================================
--- pkg/Rcpp/src/Module.cpp	2010-09-16 18:39:37 UTC (rev 2121)
+++ pkg/Rcpp/src/Module.cpp	2010-09-16 19:00:21 UTC (rev 2122)
@@ -1,4 +1,4 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 4 -*-
 //
 // Module.cpp: Rcpp R/C++ interface class library -- Rcpp modules
 //

Modified: pkg/Rcpp/src/Reference.cpp
===================================================================
--- pkg/Rcpp/src/Reference.cpp	2010-09-16 18:39:37 UTC (rev 2121)
+++ pkg/Rcpp/src/Reference.cpp	2010-09-16 19:00:21 UTC (rev 2122)
@@ -1,4 +1,4 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 4 -*-
 //
 // S4.cpp: Rcpp R/C++ interface class library -- S4 objects
 //