X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cff982bd049d26d7acbd0e23324e0de051b06d0d..2fdfd29d8bd702dc10068f8f6ead958115a52e5a:/include/xbt/string.hpp diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp index 0a50fb6e71..a4624489fb 100644 --- a/include/xbt/string.hpp +++ b/include/xbt/string.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -31,13 +31,13 @@ namespace xbt { * * @ingroup XBT_str */ -XBT_PUBLIC std::string string_printf(const char* fmt, ...); +XBT_PUBLIC std::string string_printf(const char* fmt, ...) XBT_ATTRIB_PRINTF(1, 2); /** Create a C++ string from a C-style format * * @ingroup XBT_str */ -XBT_PUBLIC std::string string_vprintf(const char* fmt, va_list ap); +XBT_PUBLIC std::string string_vprintf(const char* fmt, va_list ap) XBT_ATTRIB_PRINTF(1, 0); #if SIMGRID_HAVE_MC @@ -145,7 +145,7 @@ public: // Capacity size_t size() const { return str.len; } size_t length() const { return str.len; } - bool empty() const { return str.len != 0; } + bool empty() const { return str.len == 0; } void shrink_to_fit() { /* Being there, but doing nothing */} // Element access @@ -174,7 +174,7 @@ public: return data()[i]; } // Conversion - static string_data& to_string_data(string& s) { return s.str; } + static const string_data& to_string_data(const string& s) { return s.str; } operator std::string() const { return std::string(this->c_str(), this->size()); } // Iterators