X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7697bfda032a59b6074018dd78ac0f4de838829..e71a2a302d28430dc1bfee906f842f5f3d0fa3ce:/include/xbt/string.hpp diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp index 527892905c..83e2820a68 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-2021. 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. */ @@ -72,11 +72,11 @@ class XBT_PUBLIC string { public: // Types - typedef std::size_t size_type; - typedef char& reference; - typedef const char& const_reference; - typedef char* iterator; - typedef const char* const_iterator; + using size_type = std::size_t; + using reference = char&; + using const_reference = const char&; + using iterator = char*; + using const_iterator = const char*; // Dtor ~string() @@ -101,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) noexcept : str(std::move(s.str)) + string(string&& s) noexcept : str(s.str) { s.str.len = 0; s.str.data = &NUL;