improve header hygiene

ropensci · Aug 27, 2023 · 7f3b3b7 · 7f3b3b7
1 parent bcff01a
commit 7f3b3b7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/read_ods_internals.h b/src/read_ods_internals.h
@@ -3,8 +3,7 @@
 #include "cpp11.hpp"
 #include "cpp11/r_string.hpp"
 
-// #include "rapidxml/rapidxml.hpp"
-#include "rapidxml/rapidxml_ext.hpp"
+#include "rapidxml/rapidxml.hpp"
 
 #include <vector>
 #include <string>

diff --git a/src/splice.cpp b/src/splice.cpp
@@ -1,7 +1,4 @@
-#include "is_ods.h"
-#include "read_ods_internals.h"
-#include "write_sheet_.h"
-#include "rapidxml/rapidxml_utils.hpp"
+#include "splice.h"
 
 [[cpp11::register]]
 std::string splice_sheet(const std::string original_xml, const std::string sheet_xml, const bool flat) {

diff --git a/src/splice.h b/src/splice.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "cpp11.hpp"
+#include "cpp11/r_string.hpp"
+#include <fstream>
+#include <string>
+
+#include "rapidxml/rapidxml_ext.hpp"
+#include "rapidxml/rapidxml_utils.hpp"
+
+std::string splice_sheet_(const std::string original_xml, const std::string sheet_xml, const bool flat);
+std::string update_sheet_(const std::string original_xml, const std::string sheet_xml, const bool flat, const int sheet);