X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ddc7703ca9a78d9a3cff396af9635206bf57ee84..aaa2d952c3f91042dc283f8dd4de9dd41b62e3ba:/include/xbt/string.hpp diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp index 9840855a42..be542c0914 100644 --- a/include/xbt/string.hpp +++ b/include/xbt/string.hpp @@ -9,20 +9,26 @@ #include +#include +#include + #if HAVE_MC #include #include #include #include -#include #include #include +#endif + namespace simgrid { namespace xbt { +#if HAVE_MC + /** POD structure representation of a string */ struct string_data { @@ -281,21 +287,16 @@ bool operator>=(std::string const& a, string const& b) return b <= a; } -} -} - #else -#include +typedef std::string string; -namespace simgrid { -namespace xbt { +#endif -typedef std::string string; +std::string string_vprintf(const char *fmt, va_list ap); +std::string string_printf(const char *fmt, ...); } } #endif - -#endif