From 2180d04ab897cf8064632668bb5022b09c213a76 Mon Sep 17 00:00:00 2001 From: Grant Erickson Date: Wed, 24 Oct 2018 21:36:43 -0700 Subject: [PATCH 1/2] Address -Woverloaded-virtual warnings. --- src/test-apps/MockDMPublisher.h | 8 ++++++-- src/test-apps/wdmtest.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/test-apps/MockDMPublisher.h b/src/test-apps/MockDMPublisher.h index 178975535d..6b651a1bba 100644 --- a/src/test-apps/MockDMPublisher.h +++ b/src/test-apps/MockDMPublisher.h @@ -1,5 +1,6 @@ /* * + * Copyright (c) 2018 Google LLC. * Copyright (c) 2016-2017 Nest Labs, Inc. * All rights reserved. * @@ -34,7 +35,8 @@ * table. */ -class MockDMPublisher : public nl::Weave::Profiles::DataManagement::DMPublisher +class MockDMPublisher __FINAL : + public nl::Weave::Profiles::DataManagement::DMPublisher { public: /* @@ -46,7 +48,9 @@ class MockDMPublisher : public nl::Weave::Profiles::DataManagement::DMPublisher WEAVE_ERROR UpdateIndication(ExchangeContext *aResponseCtx, ReferencedTLVData &aDataList); - void IncompleteIndication(const uint64_t &aPeerNodeId, StatusReport &aReport); + virtual void IncompleteIndication(const uint64_t &aPeerNodeId, StatusReport &aReport); + + using DMPublisher::IncompleteIndication; #if WEAVE_CONFIG_WDM_ALLOW_PUBLISHER_SUBSCRIPTION diff --git a/src/test-apps/wdmtest.cpp b/src/test-apps/wdmtest.cpp index 921e4f35db..2f7d83da8e 100644 --- a/src/test-apps/wdmtest.cpp +++ b/src/test-apps/wdmtest.cpp @@ -1,5 +1,6 @@ /* * + * Copyright (c) 2018 Google LLC. * Copyright (c) 2013-2017 Nest Labs, Inc. * All rights reserved. * @@ -274,7 +275,7 @@ ReferencedTLVData DataList; * a sub-class of the WDM client and supply the relevant methods as follows. */ -class WDMTestClient : +class WDMTestClient __FINAL : public DMClient { WEAVE_ERROR ViewConfirm(const uint64_t &aResponderId, StatusReport &aStatus, uint16_t aTxnId) @@ -510,10 +511,13 @@ class WDMTestClient : return err; } - void IncompleteIndication(const uint64_t &aPeerNodeId, StatusReport &aReport) + virtual void IncompleteIndication(const uint64_t &aPeerNodeId, StatusReport &aReport) { + return; } + using DMClient::IncompleteIndication; + }; int main(int argc, char *argv[]) From 88da2472734932d05966949943f76af68ffe9276 Mon Sep 17 00:00:00 2001 From: Grant Erickson Date: Thu, 25 Oct 2018 11:29:09 -0700 Subject: [PATCH 2/2] Address -Woverloaded-virtual warnings. --- src/test-apps/TestDataManagement.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test-apps/TestDataManagement.cpp b/src/test-apps/TestDataManagement.cpp index fe79141504..42847d36d7 100644 --- a/src/test-apps/TestDataManagement.cpp +++ b/src/test-apps/TestDataManagement.cpp @@ -281,7 +281,7 @@ static WEAVE_ERROR ValidatePath(TLVReader &aReader, * a sub-class of the WDM client and supply the relevant methods as follows. */ -class DMTestClient : +class DMTestClient __FINAL : public DMClient { public: @@ -327,11 +327,13 @@ class DMTestClient : return err; } - void IncompleteIndication(const uint64_t &aPeerNodeId, StatusReport &aReport) + virtual void IncompleteIndication(const uint64_t &aPeerNodeId, StatusReport &aReport) { printf("processing: \n"); } + using DMClient::IncompleteIndication; + #if WEAVE_CONFIG_WDM_ALLOW_CLIENT_SUBSCRIPTION WEAVE_ERROR SubscribeConfirm(const uint64_t &aResponderId, StatusReport &aStatus, uint16_t aTxnId)