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
Try to get rid of some old and weird way of doing things for fortran.
[simgrid.git]
/
include
/
xbt
/
string.hpp
diff --git
a/include/xbt/string.hpp
b/include/xbt/string.hpp
index
6bcf4c7
..
0c9221a
100644
(file)
--- a/
include/xbt/string.hpp
+++ b/
include/xbt/string.hpp
@@
-11,6
+11,7
@@
#include <string>
#include <cstdarg>
#include <string>
#include <cstdarg>
+#include <stdlib.h>
#if HAVE_MC
#if HAVE_MC
@@
-88,10
+89,8
@@
public:
string_data::data[string_data::len] = '\0';
}
}
string_data::data[string_data::len] = '\0';
}
}
- string() : string (nullptr, 0) {}
- string(const char* s)
- : string(s, s == nullptr ? 0 : strlen(s))
- {}
+ string() : string (const_cast<char*>(&NUL), 0) {}
+ 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)
{
@@
-105,15
+104,15
@@
public:
// Assign
void assign(const char* s, size_t size)
{
// Assign
void assign(const char* s, size_t size)
{
- if (string_data::data != &NUL)
+ if (string_data::data != &NUL)
{
std::free(string_data::data);
std::free(string_data::data);
- if (size == 0) {
- string_data::len = 0;
string_data::data = nullptr;
string_data::data = nullptr;
- } else {
+ string_data::len = 0;
+ }
+ if (size != 0) {
string_data::len = size;
string_data::data = (char*) std::malloc(string_data::len + 1);
string_data::len = size;
string_data::data = (char*) std::malloc(string_data::len + 1);
- memcpy(string_data::data, s, string_data::len);
+
std::
memcpy(string_data::data, s, string_data::len);
string_data::data[string_data::len] = '\0';
}
}
string_data::data[string_data::len] = '\0';
}
}
@@
-121,7
+120,7
@@
public:
// Copy
string& operator=(const char* s)
{
// Copy
string& operator=(const char* s)
{
- assign(s, s
== nullptr ? 0 : s
td::strlen(s));
+ assign(s, std::strlen(s));
return *this;
}
string& operator=(string const& s)
return *this;
}
string& operator=(string const& s)
@@
-185,7
+184,7
@@
public:
void clear()
{
string_data::len = 0;
void clear()
{
string_data::len = 0;
- string_data::data =
(char*) &NUL
;
+ string_data::data =
const_cast<char*>(&NUL)
;
}
bool equals(const char* data, std::size_t len) const
}
bool equals(const char* data, std::size_t len) const
@@
-300,9
+299,18
@@
typedef std::string string;
#endif
#endif
-std::string string_vprintf(const char *fmt, va_list ap);
+/** Create a C++ string from a C-style format
+ *
+ * @ingroup XBT_str
+*/
std::string string_printf(const char *fmt, ...);
std::string string_printf(const char *fmt, ...);
+/** Create a C++ string from a C-style format
+ *
+ * @ingroup XBT_str
+*/
+std::string string_vprintf(const char *fmt, va_list ap);
+
}
}
}
}