Move declarations.

[simgrid.git] / include / xbt / string.hpp

diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp
index 89311f0846cd9622b7911c21512a523209c45d33..bd174b8044babeec7a2a3889b3fb386dcd11f1c9 100644 (file)
--- a/include/xbt/string.hpp
+++ b/include/xbt/string.hpp
@@ -27,6 +27,18 @@
 namespace simgrid {
 namespace xbt {
 
+/** Create a C++ string from a C-style format
+ *
+ * @ingroup XBT_str
+ */
+XBT_PUBLIC std::string string_printf(const char* fmt, ...);
+
+/** Create a C++ string from a C-style format
+ *
+ * @ingroup XBT_str
+ */
+XBT_PUBLIC std::string string_vprintf(const char* fmt, va_list ap);
+
 #if SIMGRID_HAVE_MC
 
 /** POD structure representation of a string
@@ -89,7 +101,7 @@ public:
   string() : string(&NUL, 0) {}
   explicit string(const char* s) : string(s, strlen(s)) {}
   string(string const& s) : string(s.c_str(), s.size()) {}
-  string(string&& s) : str(std::move(s.str))
+  string(string&& s) noexcept : str(std::move(s.str))
   {
     s.str.len  = 0;
     s.str.data = &NUL;
@@ -292,18 +304,6 @@ bool operator>=(std::string const& a, string const& b)
 typedef std::string string;
 
 #endif
-
-/** Create a C++ string from a C-style format
- *
- * @ingroup XBT_str
-*/
-XBT_PUBLIC std::string string_printf(const char* fmt, ...);
-
-/** Create a C++ string from a C-style format
- *
- * @ingroup XBT_str
-*/
-XBT_PUBLIC std::string string_vprintf(const char* fmt, va_list ap);
 }
 }