From e05e29119bcc6b0fb7df3e08269822356c91c107 Mon Sep 17 00:00:00 2001 From: coderhyme Date: Fri, 12 Jun 2015 15:06:10 +0900 Subject: [PATCH] Remove unnecessary constructors of ResourceAttributes Change-Id: Iede8ffe5c4aa5f12a40333e4b101cf1fe640b436 Signed-off-by: coderhyme Reviewed-on: https://gerrit.iotivity.org/gerrit/1296 Reviewed-by: Uze Choi Tested-by: Uze Choi --- .../common/primitiveResource/include/ResourceAttributes.h | 2 -- .../common/primitiveResource/src/ResourceAttributes.cpp | 12 +----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/service/basis/common/primitiveResource/include/ResourceAttributes.h b/service/basis/common/primitiveResource/include/ResourceAttributes.h index 62f208d..f330d91 100755 --- a/service/basis/common/primitiveResource/include/ResourceAttributes.h +++ b/service/basis/common/primitiveResource/include/ResourceAttributes.h @@ -328,7 +328,6 @@ public: bool operator!=(const iterator&) const; private: - explicit iterator(ResourceAttributes&); explicit iterator(base_iterator&&); private: @@ -362,7 +361,6 @@ public: bool operator!=(const const_iterator&) const; private: - explicit const_iterator(const ResourceAttributes&); explicit const_iterator(base_iterator&&); private: diff --git a/service/basis/common/primitiveResource/src/ResourceAttributes.cpp b/service/basis/common/primitiveResource/src/ResourceAttributes.cpp index b558dfd..c6f5c48 100755 --- a/service/basis/common/primitiveResource/src/ResourceAttributes.cpp +++ b/service/basis/common/primitiveResource/src/ResourceAttributes.cpp @@ -180,11 +180,6 @@ ResourceAttributes::iterator::iterator() : { } -ResourceAttributes::iterator::iterator(ResourceAttributes& attrs) : - iterator{ attrs.m_keyValues.begin() } -{ -} - ResourceAttributes::iterator::iterator(base_iterator&& iter) : m_cur{ std::move(iter) }, m_keyValuePair{ this } @@ -230,11 +225,6 @@ ResourceAttributes::const_iterator::const_iterator() : { } -ResourceAttributes::const_iterator::const_iterator(const ResourceAttributes& attrs) : - const_iterator{ attrs.m_keyValues.begin() } -{ -} - ResourceAttributes::const_iterator::const_iterator(base_iterator&& iter) : m_cur{ iter }, m_keyValuePair{ this } { @@ -284,7 +274,7 @@ bool ResourceAttributes::const_iterator::operator!=(const const_iterator& rhs) c auto ResourceAttributes::begin() -> iterator { - return iterator{ *this }; + return iterator{ m_keyValues.begin() }; } auto ResourceAttributes::end() -> iterator -- 2.7.4