ARROW-10137: [C++][R] Move nameof.h into R subproject

Closes apache#8308 from bkietz/10137-Fix-cpp-helper-that-break Authored-by: Benjamin Kietzman <[email protected]> Signed-off-by: Neal Richardson <[email protected]>
sirensolutions · Jun 7, 2021 · 796ebbe · 796ebbe
1 parent d7e160f
commit 796ebbe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/r/src/arrow_cpp11.h b/r/src/arrow_cpp11.h
@@ -22,7 +22,7 @@
 #include <vector>
 #undef Free
 
-#include "arrow/util/nameof.h"
+#include "./nameof.h"
 
 namespace cpp11 {
 
@@ -160,8 +160,8 @@ struct ns {
 template <typename Pointer>
 Pointer r6_to_pointer(SEXP self) {
   if (!Rf_inherits(self, "ArrowObject")) {
-    std::string type_name =
-        arrow::util::nameof<typename std::remove_pointer<Pointer>::type>();
+    std::string type_name = arrow::util::nameof<
+        cpp11::decay_t<typename std::remove_pointer<Pointer>::type>>();
     cpp11::stop("Invalid R object for %s, must be an ArrowObject", type_name.c_str());
   }
   void* p = R_ExternalPtrAddr(Rf_findVarInFrame(self, arrow::r::symbols::xp));

diff --git a/cpp/src/arrow/util/nameof.h → r/src/nameof.h b/cpp/src/arrow/util/nameof.h → r/src/nameof.h