diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-10-16 17:07:02 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-10-16 17:07:02 +0000 |
| commit | a516fc9e57f37edf4a6c7615b173991aeb97d7cd (patch) | |
| tree | 1f41ebc625097bbb054035ab4f01e040d4e02b1e /include | |
| parent | fe76991be74b1935c245674289747d08ebe32e4b (diff) | |
- captcha is accepted in all requests, not only during registration
- the Nick field is calculated automaticaly as concatenated FirstName & LastName
- version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@6504 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_json.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/m_json.h b/include/m_json.h index 9556becc00..99266e27d7 100644 --- a/include/m_json.h +++ b/include/m_json.h @@ -124,10 +124,13 @@ class JSONROOT JSONNODE *m_node;
public:
- __forceinline JSONROOT(LPCSTR text) { m_node = json_parse(text); }
+ __forceinline JSONROOT() { m_node = NULL; }
+ __forceinline JSONROOT(LPCSTR text) { Parse(text); }
__forceinline ~JSONROOT() { json_delete(m_node); }
__forceinline operator JSONNODE*() const { return m_node; }
+
+ __forceinline JSONNODE* Parse(LPCSTR text) { return (m_node = json_parse(text)); }
};
#ifdef _XSTRING_
|