X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e2e32849ed01a869c9c70e78014e6938f098be5..a250bd9db089b639e2298265b21577765a51f1bc:/include/xbt/string.hpp diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp index ae6728ce78..0cc1c4899a 100644 --- a/include/xbt/string.hpp +++ b/include/xbt/string.hpp @@ -89,7 +89,7 @@ public: } } string() : string(&NUL, 0) {} - string(const char* s) : string(s, strlen(s)) {} + explicit string(const char* s) : string(s, strlen(s)) {} string(string const& s) : string(s.c_str(), s.size()) {} string(string&& s) { @@ -98,7 +98,7 @@ public: s.string_data::len = 0; s.string_data::data = &NUL; } - string(std::string const& s) : string(s.c_str(), s.size()) {} + explicit string(std::string const& s) : string(s.c_str(), s.size()) {} // Assign void assign(const char* s, size_t size) @@ -300,14 +300,13 @@ typedef std::string string; * * @ingroup XBT_str */ -std::string string_printf(const char *fmt, ...); +XBT_PUBLIC(std::string) string_printf(const char* fmt, ...); /** Create a C++ string from a C-style format * * @ingroup XBT_str */ -std::string string_vprintf(const char *fmt, va_list ap); - +XBT_PUBLIC(std::string) string_vprintf(const char* fmt, va_list ap); } }