From: Philippe Coval Date: Sun, 6 Mar 2016 11:57:06 +0000 (+0100) Subject: Fixed build issue caused by merge of 2 similar changes on DiscoveryManagerTest X-Git-Tag: 1.2.0+RC1~591 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5805d8258eac0650ccdcb60864883b2aad7a866;p=platform%2Fupstream%2Fiotivity.git Fixed build issue caused by merge of 2 similar changes on DiscoveryManagerTest Revert "Fixed a compilation error in DiscoveryManagerTest.cpp." This reverts commit d3f7b087e2d272dfbfba4f1114fd030c9d7219a2. Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2) Change-Id: I374236826587d67a07a0dd1ba39ac977b1943d29 Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/5457 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- diff --git a/service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp b/service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp index ef5aaa2..7572022 100755 --- a/service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp +++ b/service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp @@ -55,9 +55,6 @@ public: if (m_task) m_task->cancel(); } - ScopedTask(ScopedTask&&) = default; - ScopedTask& operator=(ScopedTask&&) = default; - RCSDiscoveryManager::DiscoveryTask* operator->() { return m_task.get();