Skip to content

Commit f4c1611

Browse files
committed
make msvc happy
1 parent a0fa1c1 commit f4c1611

2 files changed

Lines changed: 26 additions & 17 deletions

File tree

test/src/document_test.cpp

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include <odr/document.hpp>
22
#include <odr/document_element.hpp>
33
#include <odr/html.hpp>
4-
#include <odr/quantity.hpp>
54

65
#include <test_util.hpp>
76

@@ -73,8 +72,10 @@ TEST(Document, edit_odt) {
7372
};
7473
edit(document.root_element());
7574

76-
document.save(std::filesystem::current_path() / "about_edit.odt");
77-
DocumentFile(std::filesystem::current_path() / "about_edit.odt");
75+
std::string output_path =
76+
(std::filesystem::current_path() / "about_edit.odt").string();
77+
document.save(output_path);
78+
DocumentFile{output_path};
7879
}
7980

8081
TEST(Document, edit_docx) {
@@ -95,8 +96,10 @@ TEST(Document, edit_docx) {
9596
};
9697
edit(document.root_element());
9798

98-
document.save(std::filesystem::current_path() / "style-various-1_edit.docx");
99-
DocumentFile(std::filesystem::current_path() / "style-various-1_edit.docx");
99+
std::string output_path =
100+
(std::filesystem::current_path() / "style-various-1_edit.docx").string();
101+
document.save(output_path);
102+
DocumentFile{output_path};
100103
}
101104

102105
TEST(Document, edit_odt_diff) {
@@ -110,10 +113,11 @@ TEST(Document, edit_odt_diff) {
110113

111114
html::edit(document, diff);
112115

113-
document.save(std::filesystem::current_path() /
114-
"style-various-1_edit_diff.odt");
115-
DocumentFile(std::filesystem::current_path() /
116-
"style-various-1_edit_diff.odt");
116+
std::string output_path =
117+
(std::filesystem::current_path() / "style-various-1_edit_diff.odt")
118+
.string();
119+
document.save(output_path);
120+
DocumentFile{output_path};
117121
}
118122

119123
TEST(Document, edit_ods_diff) {
@@ -129,8 +133,10 @@ TEST(Document, edit_ods_diff) {
129133

130134
html::edit(document, diff);
131135

132-
document.save(std::filesystem::current_path() / "pages_edit_diff.ods");
133-
DocumentFile(std::filesystem::current_path() / "pages_edit_diff.ods");
136+
std::string output_path =
137+
(std::filesystem::current_path() / "pages_edit_diff.ods").string();
138+
document.save(output_path);
139+
DocumentFile{output_path};
134140
}
135141

136142
TEST(Document, edit_docx_diff) {
@@ -145,8 +151,9 @@ TEST(Document, edit_docx_diff) {
145151

146152
html::edit(document, diff);
147153

148-
document.save(std::filesystem::current_path() /
149-
"style-various-1_edit_diff.docx");
150-
DocumentFile(std::filesystem::current_path() /
151-
"style-various-1_edit_diff.docx");
154+
std::string output_path =
155+
(std::filesystem::current_path() / "style-various-1_edit_diff.docx")
156+
.string();
157+
document.save(output_path);
158+
DocumentFile{output_path};
152159
}

test/src/internal/zip/zip_archive_test.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ TEST(ZipArchive, create_and_save) {
5454
}
5555

5656
TEST(ZipArchive, create) {
57-
const std::string path = std::filesystem::current_path() / "created.zip";
57+
const std::string path =
58+
(std::filesystem::current_path() / "created.zip").string();
5859

5960
{
6061
ZipArchive zip;
@@ -98,7 +99,8 @@ TEST(ZipArchive, create) {
9899
}
99100

100101
TEST(ZipArchive, create_order) {
101-
const std::string path = std::filesystem::current_path() / "created.zip";
102+
const std::string path =
103+
(std::filesystem::current_path() / "created.zip").string();
102104
const std::vector<std::string> entries{"z", "one", "two", "three", "a", "0"};
103105

104106
{

0 commit comments

Comments
 (0)