diff --git a/src/catalog_xliff.cpp b/src/catalog_xliff.cpp index 44f5772293..955af858a1 100644 --- a/src/catalog_xliff.cpp +++ b/src/catalog_xliff.cpp @@ -229,7 +229,7 @@ class XLIFF12CatalogItem : public XLIFFCatalogItem } else { - m_translations.emplace_back(""); + m_translations.push_back(""); } for (auto note: node.children("note")) @@ -332,7 +332,7 @@ class XLIFF2CatalogItem : public XLIFFCatalogItem } else { - m_translations.emplace_back(""); + m_translations.push_back(""); } std::string state = node.attribute("subState").value(); diff --git a/src/str_helpers.h b/src/str_helpers.h index abd6ad5a5f..c89121d574 100644 --- a/src/str_helpers.h +++ b/src/str_helpers.h @@ -90,7 +90,7 @@ inline wxString to_wx(const char *utf8) inline wxString to_wx(const std::string& utf8) { - return wxString::FromUTF8(utf8); + return wxString::FromUTF8(utf8.c_str()); } #if defined(__cplusplus) && defined(__OBJC__)