[Rcpp-commits] r3971 - in pkg/Rcpp: . inst/include/Rcpp/sugar/logical

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

Author: romain
Date: 2012-11-15 08:15:11 +0100 (Thu, 15 Nov 2012)
New Revision: 3971

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/sugar/logical/SingleLogicalResult.h
Log:
applying Karl's patch

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-11-15 02:59:05 UTC (rev 3970)
+++ pkg/Rcpp/ChangeLog	2012-11-15 07:15:11 UTC (rev 3971)
@@ -1,3 +1,8 @@
+2012-11-15  Romain Francois <romain at r-enthusiasts.com>
+
+        * include/Rcpp/sugar/logical/SingleLogicalResult.h : apply patch suggested
+        by Karl Millar
+
 2012-11-14  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/announce/ANNOUNCE-0.10.0.txt: Fix typo spotted by Martin

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/logical/SingleLogicalResult.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/logical/SingleLogicalResult.h	2012-11-15 02:59:05 UTC (rev 3970)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/logical/SingleLogicalResult.h	2012-11-15 07:15:11 UTC (rev 3971)
@@ -2,7 +2,7 @@
 //
 // SingleLogicalResult.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -33,7 +33,7 @@
 
 template <bool x>
 class conversion_to_bool_is_forbidden : 
-	conversion_to_bool_is_forbidden<x>{
+	forbidden_conversion<x>{
 	public:
 		void touch(){}
 };