[Rprotobuf-commits] r625 - pkg/R

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

Author: murray
Date: 2013-12-28 05:45:51 +0100 (Sat, 28 Dec 2013)
New Revision: 625

Modified:
   pkg/R/merge.R
Log:
Replace last call to throw with stop() since we deleted throw()
earlier today.



Modified: pkg/R/merge.R
===================================================================
--- pkg/R/merge.R	2013-12-28 01:43:57 UTC (rev 624)
+++ pkg/R/merge.R	2013-12-28 04:45:51 UTC (rev 625)
@@ -3,9 +3,7 @@
 	c( x = "Message", y = "Message" ), 
 	function( x, y , ... ){
 		if( !identical( x at type, y at type ) ){
-			throw( 
-				sprintf( "incompatible message types, cannot merge '%s' and '%s'", x at type, y at type ), 
-				"IncompatibleType" )
+                        stop(sprintf("incompatible message types, cannot merge '%s' and '%s'", x at type, y at type))
 		}
 		
 		message <- .Call( "Message__merge", x at pointer, y at pointer )