make xbt_os_thread_self() useless, and kill it

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

diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp
index 15bf86d..cd51303 100644 (file)
--- a/include/xbt/string.hpp
+++ b/include/xbt/string.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_XBT_STRING_HPP
 #define SIMGRID_XBT_STRING_HPP
 
-#include <simgrid_config.h>
+#include <simgrid/config.h>
 
 #include <cstdarg>
 #include <cstdlib>
@@ -54,17 +54,14 @@ struct string_data {
  *  * the [C++11-conforming implementation](https://gcc.gnu.org/gcc-5/changes.html)
  *    does not use refcouting/COW but has a small string optimization.
  */
-XBT_PUBLIC_CLASS string : private string_data {
+class XBT_PUBLIC string : private string_data {
   static char NUL;
 
 public:
   // Types
   typedef std::size_t size_type;
-  typedef std::ptrdiff_t difference_type;
   typedef char& reference;
   typedef const char& const_reference;
-  typedef char* pointer;
-  typedef const char* const_pointer;
   typedef char* iterator;
   typedef const char* const_iterator;
 
@@ -139,7 +136,7 @@ public:
   bool empty() const    { return len != 0; }
   void shrink_to_fit() { /* Being there, but doing nothing */}
 
-  // Alement access
+  // Element access
   char* data()              { return string_data::data; }
   const char* data()  const { return string_data::data; }
   char* c_str()             { return string_data::data; }