From 2ee188ce51aed4ac7f88c746f6ee68a91f29bbbf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 May 2015 21:38:22 +0000 Subject: oops... correct version of operator git-svn-id: http://svn.miranda-ng.org/main/trunk@13834 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/mir_core/src/json/JSONNode.h | 4 ++-- src/mir_core/src/mir_core.def | 2 +- src/mir_core/src/mir_core64.def | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/mir_core/src/json/JSONNode.h b/src/mir_core/src/json/JSONNode.h index 01c6ffb405..3d7fee9be5 100644 --- a/src/mir_core/src/json/JSONNode.h +++ b/src/mir_core/src/json/JSONNode.h @@ -136,7 +136,7 @@ public: JSONNode & at_nocase(const json_string & name_t); const JSONNode & at_nocase(const json_string & name_t) const; #endif - bool operator!() const; + operator bool() const; JSONNode & operator[](const json_char *name_t); const JSONNode & operator[](const json_char *name_t) const; #ifdef JSON_LIBRARY @@ -516,7 +516,7 @@ inline bool JSONNode::isnull(void) const JSON_CHECK_INTERNAL(); return internal->type() == JSON_NULL; } -inline bool JSONNode::operator!() const +inline JSONNode::operator bool() const { JSON_CHECK_INTERNAL(); return internal->type() == JSON_NULL; diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 8c3473fcc0..58bbb59e16 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -1240,4 +1240,4 @@ Proto_RegisterModule @1074 NONAME ?write@JSONNode@@QAE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ @1243 NONAME ?write_formatted@JSONNode@@QAE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ @1244 NONAME ?isnull@JSONNode@@QBE_NXZ @1245 NONAME -??7JSONNode@@QBE_NXZ @1246 NONAME +??BJSONNode@@QBE_NXZ @1246 NONAME diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 70dc985da7..699e984893 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -1240,4 +1240,4 @@ Proto_RegisterModule @1074 NONAME ?write@JSONNode@@QEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ @1243 NONAME ?write_formatted@JSONNode@@QEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ @1244 NONAME ?isnull@JSONNode@@QEBA_NXZ @1245 NONAME -??7JSONNode@@QEBA_NXZ @1246 NONAME +??BJSONNode@@QEBA_NXZ @1246 NONAME -- cgit v1.2.3