A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
xbt
/
string.hpp
diff --git
a/include/xbt/string.hpp
b/include/xbt/string.hpp
index
f37e189
..
912fe8d
100644
(file)
--- a/
include/xbt/string.hpp
+++ b/
include/xbt/string.hpp
@@
-8,15
+8,14
@@
#include <simgrid_config.h>
#include <simgrid_config.h>
-#include <string>
#include <cstdarg>
#include <cstdarg>
-#include <stdlib.h>
+#include <cstdlib>
+#include <string>
#if SIMGRID_HAVE_MC
#include <stdexcept>
#include <cstddef>
#if SIMGRID_HAVE_MC
#include <stdexcept>
#include <cstddef>
-#include <cstdlib>
#include <cstring>
#include <iterator>
#include <cstring>
#include <iterator>
@@
-89,7
+88,7
@@
public:
}
}
string() : string (const_cast<char*>(&NUL), 0) {}
}
}
string() : string (const_cast<char*>(&NUL), 0) {}
-
explicit
string(const char* s) : string(s, strlen(s)) {}
+ string(const char* s) : string(s, strlen(s)) {}
string(string const& s) : string(s.c_str(), s.size()) {}
string(string&& s)
{
string(string const& s) : string(s.c_str(), s.size()) {}
string(string&& s)
{
@@
-98,7
+97,7
@@
public:
s.string_data::len = 0;
s.string_data::data = const_cast<char*>(&NUL);
}
s.string_data::len = 0;
s.string_data::data = const_cast<char*>(&NUL);
}
-
explicit
string(std::string const& s) : string(s.c_str(), s.size()) {}
+ string(std::string const& s) : string(s.c_str(), s.size()) {}
// Assign
void assign(const char* s, size_t size)
// Assign
void assign(const char* s, size_t size)
@@
-165,7
+164,7
@@
public:
return data()[i];
}
// Conversion
return data()[i];
}
// Conversion
-
explicit
operator std::string() const { return std::string(this->c_str(), this->size()); }
+ operator std::string() const { return std::string(this->c_str(), this->size()); }
// Iterators
iterator begin() { return data(); }
// Iterators
iterator begin() { return data(); }