[Rprotobuf-commits] r449 - in pkg: . R

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

Author: edd
Date: 2012-05-14 23:30:13 +0200 (Mon, 14 May 2012)
New Revision: 449

Modified:
   pkg/ChangeLog
   pkg/R/lookup.R
Log:
comment-out call to unlockBinding() which triggers a 'Note:' in R CMD check, and which isn't needed
update ChangeLog


Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2012-05-14 20:52:11 UTC (rev 448)
+++ pkg/ChangeLog	2012-05-14 21:30:13 UTC (rev 449)
@@ -1,3 +1,14 @@
+2012-05-14  Dirk Eddelbuettel  <edd at debian.org>
+
+	* R/lookup.R: comment-out unlockBinding() which R CMD check does not
+	like as it turns out that we do not need it here anyway
+
+2012-05-13  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/rprotobuf.h: Added '#include <unistd.h>' to make g++-4.7 happy
+
+	* src/*: Reversed out SVN revisions 426 to 434 related to int64
+
 2012-04-07  Dirk Eddelbuettel  <edd at debian.org>
 
 	* R/zzz.R: Add 'lib.loc=libname' to packageDescription() call as

Modified: pkg/R/lookup.R
===================================================================
--- pkg/R/lookup.R	2012-05-14 20:52:11 UTC (rev 448)
+++ pkg/R/lookup.R	2012-05-14 21:30:13 UTC (rev 449)
@@ -1,21 +1,21 @@
 
-# attaches the descriptor pool to the search path at the given 
+# attaches the descriptor pool to the search path at the given
 # position
 
 OTABLE <- NULL
 NAMESPACE <- environment()
 
 attachDescriptorPool <- function( pos = 2){
-	
+
 	if( is.null( OTABLE ) ){
-		unlockBinding( "OTABLE", NAMESPACE )
-		
-		otable <- .Call( "newProtocolBufferLookup" , PACKAGE = "RProtoBuf" ) 
+		#unlockBinding( "OTABLE", NAMESPACE )
+
+		otable <- .Call( "newProtocolBufferLookup" , PACKAGE = "RProtoBuf" )
 		attach( otable, pos = pos, name = "RProtoBuf:DescriptorPool" )
-		
-		assign( "OTABLE", otable, envir = NAMESPACE, inherits = FALSE) 
+
+		assign( "OTABLE", otable, envir = NAMESPACE, inherits = FALSE)
 		lockBinding( "OTABLE", NAMESPACE )
 	}
-	 
+
 }