From 49bd0c8fb4210ca046845b9140ff4d9b40750a9d Mon Sep 17 00:00:00 2001 From: Crzyrndm Date: Mon, 25 Jun 2018 21:28:17 +1200 Subject: [PATCH] Fix warnings + CI compile error --- source/cell/rich_text.cpp | 6 +++--- source/packaging/ext_list.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/cell/rich_text.cpp b/source/cell/rich_text.cpp index 47fc5b07..d7c0d9d7 100644 --- a/source/cell/rich_text.cpp +++ b/source/cell/rich_text.cpp @@ -29,12 +29,12 @@ namespace xlnt { rich_text::rich_text(const std::string &plain_text) - : rich_text(rich_text_run{plain_text, optional()}) + : rich_text({plain_text, optional()}) { } rich_text::rich_text(const std::string &plain_text, const class font &text_font) - : rich_text(rich_text_run{plain_text, optional(text_font)}) + : rich_text({plain_text, optional(text_font)}) { } @@ -51,7 +51,7 @@ void rich_text::clear() void rich_text::plain_text(const std::string &s, bool preserve_space = false) { clear(); - add_run(rich_text_run{s, {}, preserve_space}); + add_run({s, {}, preserve_space}); } std::string rich_text::plain_text() const diff --git a/source/packaging/ext_list.cpp b/source/packaging/ext_list.cpp index 7bf91274..c33cde2a 100644 --- a/source/packaging/ext_list.cpp +++ b/source/packaging/ext_list.cpp @@ -74,7 +74,7 @@ ext_list::ext::ext(const uri &ID, const std::string &serialised) : extension_ID_(ID), serialised_value_(serialised) {} -void ext_list::ext::serialise(xml::serializer &serialiser, const std::string& ns) +void ext_list::ext::serialise(xml::serializer &serialiser, const std::string&) { std::istringstream ser(serialised_value_); xml::parser p(ser, "", xml::parser::receive_default);