Merge remote-tracking branch 'RcppCore/master'

Author: coatless

ChangeLog

@@ -1,3 +1,7 @@
+2016-08-04  James J Balamuta  <balamut2@illinois.edu>
+
+        * src/attributes.cpp: Correct variable re-declaration
+
 2016-08-03  Dirk Eddelbuettel  <edd@debian.org>
 
         * .gitattributes: Added to have ChangeLog and NEWS.Rd merge via union

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.12.6.2
-Date: 2016-07-31
+Version: 0.12.6.4
+Date: 2016-08-04
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey,
  Qiang Kou, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>

inst/NEWS.Rd

@@ -16,7 +16,10 @@
       \item Improved Autogeneration Warning for RcppExports
       (James Balamuta in \ghpr{528} addressing issue \ghit{526}).
       \item Fixed invalid C++ prefix identifiers in auto-generated code 
-      (James Balamuta in \ghpr{528} addressing issue \ghit{387}).
+      (James Balamuta in \ghpr{528} and \ghpr{531} addressing issue
+      \ghit{387}). 
+      \item String constructors now set default UTF-8 encoding (Qiang Kou in
+      \ghpr{529} fixing \ghit{263}).
     }
     \item Changes in Rcpp unit tests
     \itemize{

src/attributes.cpp

@@ -2638,9 +2638,9 @@ namespace attributes {
                 }
                 ostr << "));" << std::endl;
                 ostr << "    }" << std::endl;
-                ostr << "    Rboolean rcpp_isError_gen = Rf_inherits(rcpp_result_gen, \"interrupted-error\");"
+                ostr << "    Rboolean rcpp_isInterrupt_gen = Rf_inherits(rcpp_result_gen, \"interrupted-error\");"
                      << std::endl
-                     << "    if (rcpp_isError_gen) {" << std::endl
+                     << "    if (rcpp_isInterrupt_gen) {" << std::endl
                      << "        UNPROTECT(1);" << std::endl
                      << "        Rf_onintr();" << std::endl
                      << "    }" << std::endl