Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 1 | From 24e0f55c07080a59907c190a315e279f7b2355e5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 29 Aug 2019 14:25:02 -0700 |
| 4 | Subject: [PATCH 3/4] engine: Define discover(const String &path) in base class |
| 5 | |
| 6 | this fixes the confusion that compiler may have when inheriting two |
| 7 | different classes where each of them defines discover() virtual function |
| 8 | but with different signatures |
| 9 | |
| 10 | Remove ununsed orom_vmd |
| 11 | |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | lib/engine/storage_object.h | 3 +++ |
| 15 | lib/engine/vmd_raid_info.h | 2 -- |
| 16 | 2 files changed, 3 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/lib/engine/storage_object.h b/lib/engine/storage_object.h |
| 19 | index f1feb62..9c1d3d8 100644 |
| 20 | --- a/lib/engine/storage_object.h |
| 21 | +++ b/lib/engine/storage_object.h |
| 22 | @@ -123,6 +123,9 @@ public: |
| 23 | virtual void discover() { |
| 24 | throw E_INVALID_OPERATION; |
| 25 | } |
| 26 | + virtual void discover(const String &path) { |
| 27 | + throw E_INVALID_OPERATION; |
| 28 | + } |
| 29 | virtual void addToSession(const boost::shared_ptr<Session>& pSession) = 0; |
| 30 | }; |
| 31 | |
| 32 | diff --git a/lib/engine/vmd_raid_info.h b/lib/engine/vmd_raid_info.h |
| 33 | index 2bea839..cc6ffbe 100644 |
| 34 | --- a/lib/engine/vmd_raid_info.h |
| 35 | +++ b/lib/engine/vmd_raid_info.h |
| 36 | @@ -53,8 +53,6 @@ public: |
| 37 | return SSI_ControllerTypeVMD; |
| 38 | } |
| 39 | |
| 40 | -private: |
| 41 | - struct orom_info orom_vmd; |
| 42 | }; |
| 43 | |
| 44 | #endif /* __VMD_RAID_INFO_H__INCLUDED__ */ |
| 45 | -- |
| 46 | 2.23.0 |
| 47 | |