From a29c4e0410678abe38f57e851682ca954fe0b5aa Mon Sep 17 00:00:00 2001
From: jjallaire <jj@rstudio.com>
Date: Thu, 1 Jun 2017 07:55:14 -0400
Subject: [PATCH] Fix native registration for exports with name attribute
 (fixes #702)

---
 ChangeLog          | 3 +++
 inst/NEWS.Rd       | 1 +
 src/attributes.cpp | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1fde954b6..ba7851a35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
           within package rather than current working directory.
         * src/attributes.cpp: Execute tools::package_native_routine_registration_skeleton
           within package rather than current working directory.
+2017-06-01  JJ Allaire  <jj@rstudio.com>
+
+        * src/attributes.cpp: Fix registration for exports with name attribute.
 
 2017-05-22  Dirk Eddelbuettel  <edd@debian.org>
 
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
index 3b4771809..d2ac93e15 100644
--- a/inst/NEWS.Rd
+++ b/inst/NEWS.Rd
@@ -15,6 +15,7 @@
       within package rather than current working directory.
       \item The R portion no longer uses \code{dir.exists} to no require R 3.2.0
       or newer (Elias Pipping in \ghpr{698}).
+      \item Fix native registration for exports with name attribute (\ghit{702}).
     }
   }
 }
diff --git a/src/attributes.cpp b/src/attributes.cpp
index f497c2b75..cda172709 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -1962,7 +1962,7 @@ namespace attributes {
             std::vector<std::size_t> routineArgs;
             for (std::size_t i=0;i<nativeRoutines_.size(); i++) {
                 const Attribute& attr = nativeRoutines_[i];
-                routineNames.push_back(package() + "_" + attr.exportedName());
+                routineNames.push_back(package() + "_" + attr.function().name());
                 routineArgs.push_back(attr.function().arguments().size());
             }
             if (hasCppInterface()) {