From 3e05d92dcb5f6c2017bc462554901ba27816bdb4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 17 Apr 2018 15:56:52 +0300 Subject: MNonCopyable - the common class to avoid declaring fake private constructors --- libs/libjson/src/JSONNode.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libs/libjson/src/JSONNode.h') diff --git a/libs/libjson/src/JSONNode.h b/libs/libjson/src/JSONNode.h index 8c48d24dbe..21889ca903 100644 --- a/libs/libjson/src/JSONNode.h +++ b/libs/libjson/src/JSONNode.h @@ -158,8 +158,8 @@ public: JSONNode JSON_PTR_LIB pop_back_nocase(const json_string & name_t); #endif - DECLARE_FOR_ALL_TYPES(JSONNode & operator = ) - JSONNode & operator = (const JSONNode &); + DECLARE_FOR_ALL_TYPES(JSONNode & operator=) + JSONNode & operator=(const JSONNode &); DECLARE_FOR_ALL_TYPES_CONST(bool operator ==) DECLARE_FOR_ALL_TYPES_CONST(bool operator !=) @@ -208,7 +208,7 @@ public: inline bool operator >= (const iterator & other) const { return it >= other.it; } inline bool operator < (const iterator & other) const { return it < other.it; } inline bool operator <= (const iterator & other) const { return it <= other.it; } - inline iterator & operator = (const iterator & orig){ it = orig.it; return *this; } + inline iterator & operator=(const iterator & orig){ it = orig.it; return *this; } iterator (const iterator & orig) : it(orig.it) {} private: JSONNode ** it; @@ -250,7 +250,7 @@ public: inline bool operator >= (const const_iterator & other) const { return it >= other.it; } inline bool operator < (const const_iterator & other) const { return it < other.it; } inline bool operator <= (const const_iterator & other) const { return it <= other.it; } - inline const_iterator & operator = (const const_iterator & orig){ it = orig.it; return *this; } + inline const_iterator & operator=(const const_iterator & orig){ it = orig.it; return *this; } const_iterator (const const_iterator & orig) : it(orig.it) {} private: JSONNode ** it; @@ -293,7 +293,7 @@ public: inline bool operator <= (const reverse_iterator & other) const { return it >= other.it; } inline bool operator > (const reverse_iterator & other) const { return it < other.it; } inline bool operator >= (const reverse_iterator & other) const { return it <= other.it; } - inline reverse_iterator & operator = (const reverse_iterator & orig){ it = orig.it; return *this; } + inline reverse_iterator & operator=(const reverse_iterator & orig){ it = orig.it; return *this; } reverse_iterator (const reverse_iterator & orig) : it(orig.it) {} private: JSONNode ** it; @@ -336,7 +336,7 @@ public: inline bool operator <= (const reverse_const_iterator & other) const { return it >= other.it; } inline bool operator > (const reverse_const_iterator & other) const { return it < other.it; } inline bool operator >= (const reverse_const_iterator & other) const { return it <= other.it; } - inline reverse_const_iterator & operator = (const reverse_const_iterator & orig){ it = orig.it; return *this; } + inline reverse_const_iterator & operator=(const reverse_const_iterator & orig){ it = orig.it; return *this; } reverse_const_iterator (const reverse_const_iterator & orig) : it(orig.it) {} private: JSONNode ** it; @@ -404,7 +404,7 @@ public: mynode -> unlock(mythread); } private: - auto_lock & operator = (const auto_lock &); + auto_lock & operator=(const auto_lock &); auto_lock(const auto_lock &); JSONNode * mynode; int mythread; -- cgit v1.2.3