Move NodeType enum to xml2_types.h

r-lib · Aug 29, 2023 · 03445ec · 03445ec
1 parent 69da196
commit 03445ec
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/inst/include/xml2_types.h b/inst/include/xml2_types.h
@@ -5,6 +5,24 @@
 #define R_NO_REMAP
 #include <Rinternals.h>
 
+enum NodeType {
+  missing = 1,
+  node = 2,
+  nodeset = 3,
+};
+
+inline const NodeType getNodeType(SEXP x) {
+  if (Rf_inherits(x, "xml_node")) {
+    return(NodeType::node);
+  } else if (Rf_inherits(x, "xml_nodeset")) {
+    return(NodeType::nodeset);
+  } else if (Rf_inherits(x, "xml_missing")) {
+    return(NodeType::missing);
+  } else {
+    Rf_error("Unexpected node type");
+  }
+}
+
 template <typename T> class XPtr {
   protected:
   SEXP data_;

diff --git a/src/xml2_utils.h b/src/xml2_utils.h
@@ -9,24 +9,6 @@
 #include <map>
 #include <string>
 
-enum NodeType {
-  missing = 1,
-  node = 2,
-  nodeset = 3,
-};
-
-inline const NodeType getNodeType(SEXP x) {
-  if (Rf_inherits(x, "xml_node")) {
-    return(NodeType::node);
-  } else if (Rf_inherits(x, "xml_nodeset")) {
-    return(NodeType::nodeset);
-  } else if (Rf_inherits(x, "xml_missing")) {
-    return(NodeType::missing);
-  } else {
-    Rf_error("Unexpected node type");
-  }
-}
-
 inline const xmlChar* asXmlChar(std::string const& x) {
   return (const xmlChar*) x.c_str();
 }