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
Declare as XBT_PUBLIC.
[simgrid.git]
/
include
/
xbt
/
string.hpp
diff --git
a/include/xbt/string.hpp
b/include/xbt/string.hpp
index
7d665ff
..
1916178
100644
(file)
--- a/
include/xbt/string.hpp
+++ b/
include/xbt/string.hpp
@@
-55,7
+55,8
@@
struct string_data {
* does not use refcouting/COW but has a small string optimization.
*/
XBT_PUBLIC_CLASS string : private string_data {
* does not use refcouting/COW but has a small string optimization.
*/
XBT_PUBLIC_CLASS string : private string_data {
- static const char NUL;
+ static char NUL;
+
public:
// Types
typedef std::size_t size_type;
public:
// Types
typedef std::size_t size_type;
@@
-79,7
+80,7
@@
public:
{
if (size == 0) {
string_data::len = 0;
{
if (size == 0) {
string_data::len = 0;
- string_data::data =
const_cast<char*>(&NUL)
;
+ string_data::data =
&NUL
;
} else {
string_data::len = size;
string_data::data = new char[string_data::len + 1];
} else {
string_data::len = size;
string_data::data = new char[string_data::len + 1];
@@
-87,7
+88,7
@@
public:
string_data::data[string_data::len] = '\0';
}
}
string_data::data[string_data::len] = '\0';
}
}
- string() : string
(const_cast<char*>(&NUL)
, 0) {}
+ string() : string
(&NUL
, 0) {}
string(const char* s) : string(s, strlen(s)) {}
string(string const& s) : string(s.c_str(), s.size()) {}
string(string&& s)
string(const char* s) : string(s, strlen(s)) {}
string(string const& s) : string(s.c_str(), s.size()) {}
string(string&& s)
@@
-95,9
+96,9
@@
public:
string_data::len = s.string_data::len;
string_data::data = s.string_data::data;
s.string_data::len = 0;
string_data::len = s.string_data::len;
string_data::data = s.string_data::data;
s.string_data::len = 0;
- s.string_data::data =
const_cast<char*>(&NUL)
;
+ s.string_data::data =
&NUL
;
}
}
- string(std::string const& s) : string(s.c_str(), s.size()) {}
+
explicit
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)
@@
-180,7
+181,7
@@
public:
void clear()
{
string_data::len = 0;
void clear()
{
string_data::len = 0;
- string_data::data =
const_cast<char*>(&NUL)
;
+ string_data::data =
&NUL
;
}
bool equals(const char* data, std::size_t len) const
}
bool equals(const char* data, std::size_t len) const
@@
-299,14
+300,13
@@
typedef std::string string;
*
* @ingroup XBT_str
*/
*
* @ingroup XBT_str
*/
-
std::string string_printf(const char *
fmt, ...);
+
XBT_PUBLIC(std::string) string_printf(const char*
fmt, ...);
/** Create a C++ string from a C-style format
*
* @ingroup XBT_str
*/
/** Create a C++ string from a C-style format
*
* @ingroup XBT_str
*/
-std::string string_vprintf(const char *fmt, va_list ap);
-
+XBT_PUBLIC(std::string) string_vprintf(const char* fmt, va_list ap);
}
}
}
}