diff options
Diffstat (limited to 'libs/libjson')
| -rw-r--r-- | libs/libjson/src/JSONNode.h | 2 | ||||
| -rw-r--r-- | libs/libjson/src/JSONNode.inl | 2 | ||||
| -rw-r--r-- | libs/libjson/src/internalJSONNode.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libs/libjson/src/JSONNode.h b/libs/libjson/src/JSONNode.h index 2f5119ef90..8c48d24dbe 100644 --- a/libs/libjson/src/JSONNode.h +++ b/libs/libjson/src/JSONNode.h @@ -118,7 +118,7 @@ public: json_string as_string(void) const;
#if defined(M_STRING_H__)
- CMString as_mstring(void) const;
+ CMStringW as_mstring(void) const;
#endif
long as_int(void) const;
double as_float(void) const;
diff --git a/libs/libjson/src/JSONNode.inl b/libs/libjson/src/JSONNode.inl index b012ffdbb2..48c1b9ec4f 100644 --- a/libs/libjson/src/JSONNode.inl +++ b/libs/libjson/src/JSONNode.inl @@ -101,7 +101,7 @@ inline json_string JSONNode::as_string(void) const JSON_CHECK_INTERNAL();
return internal -> as_string();
}
-inline CMString JSONNode::as_mstring(void) const
+inline CMStringW JSONNode::as_mstring(void) const
{
JSON_CHECK_INTERNAL();
return internal->as_mstring();
diff --git a/libs/libjson/src/internalJSONNode.h b/libs/libjson/src/internalJSONNode.h index 05f89b6220..c77e502543 100644 --- a/libs/libjson/src/internalJSONNode.h +++ b/libs/libjson/src/internalJSONNode.h @@ -87,7 +87,7 @@ public: json_string getcomment(void) const;
#endif
json_string as_string(void) const;
- CMString as_mstring(void) const;
+ CMStringW as_mstring(void) const;
long as_int(void) const;
json_number as_float(void) const;
bool as_bool(void) const;
@@ -288,9 +288,9 @@ inline json_string internalJSONNode::as_string(void) const { return _string;
}
-inline CMString internalJSONNode::as_mstring(void) const {
+inline CMStringW internalJSONNode::as_mstring(void) const {
Fetch();
- return CMString(ptrW(mir_utf8decodeW(_string.c_str())));
+ return CMStringW(ptrW(mir_utf8decodeW(_string.c_str())));
}
inline long internalJSONNode::as_int(void) const {
|