WeakReference

romainfrancois · romainfrancois · commit f1f8935ed2e6 · 2013-10-03T17:53:16.000+02:00
diff --git a/inst/include/Rcpp/WeakReference.h b/inst/include/Rcpp/WeakReference.h
@@ -21,12 +21,10 @@
 
 namespace Rcpp{
 
-    class WeakReference : 
-        RCPP_POLICIES(WeakReference)
-    {
+    RCPP_API_CLASS(WeakReference_Impl) {
     public:
     
-        RCPP_GENERATE_CTOR_ASSIGN(WeakReference) 
+        RCPP_GENERATE_CTOR_ASSIGN__(WeakReference_Impl) 
 	
         /**
          * wraps a weak reference
@@ -35,17 +33,25 @@ namespace Rcpp{
          *
          * @throw not_compatible if x is not a weak reference
          */
-        WeakReference( SEXP x) ; 
+        WeakReference_Impl( SEXP x){
+            if( TYPEOF(x) != WEAKREFSXP )
+                throw not_compatible( "not a weak reference" ) ;
+            Storage::set__(x) ;
+        }
 
         /** 
          * Retrieve the key
          */
-        SEXP key() ; 
+        SEXP key() {
+            return R_WeakRefKey(Storage::get__()) ;
+        }
 
         /**
          * Retrieve the value
          */
-        SEXP value() ;
+        SEXP value(){
+            return R_WeakRefValue(Storage::get__());
+        }
 
         void update(SEXP){}
     } ;
diff --git a/inst/include/RcppCommon.h b/inst/include/RcppCommon.h
@@ -97,7 +97,7 @@ namespace Rcpp{
     RCPP_API_CLASS_DECL(Pairlist) ;
     RCPP_API_CLASS_DECL(Environment) ;
     RCPP_API_CLASS_DECL(Promise) ;
-    class WeakReference ;
+    RCPP_API_CLASS_DECL(WeakReference) ;
     class Reference ;
     class S4 ;
     class Formula ;
diff --git a/src/api.cpp b/src/api.cpp
@@ -262,20 +262,6 @@ namespace Rcpp {
         }
     }
     
-    // {{{ WeakReference
-    WeakReference::WeakReference( SEXP x) {
-        if( TYPEOF(x) != WEAKREFSXP )
-            throw not_compatible( "not a weak reference" ) ;
-        set__(x) ;
-    }
-        
-    SEXP WeakReference::key() {
-        return R_WeakRefKey(get__()) ;
-    }
-        
-    SEXP WeakReference::value() {
-        return R_WeakRefValue(get__());
-    }
     // }}}
     
     // {{{ Symbol
