blob: 261358459ec69371bcf75b8dd3696d2dbb1d5dec [file] [log] [blame]
Brad Bishop0f291cc2019-09-01 15:16:57 -04001From 24e0f55c07080a59907c190a315e279f7b2355e5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 29 Aug 2019 14:25:02 -0700
4Subject: [PATCH 3/4] engine: Define discover(const String &path) in base class
5
6this fixes the confusion that compiler may have when inheriting two
7different classes where each of them defines discover() virtual function
8but with different signatures
9
10Remove ununsed orom_vmd
11
12Signed-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
18diff --git a/lib/engine/storage_object.h b/lib/engine/storage_object.h
19index 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
32diff --git a/lib/engine/vmd_raid_info.h b/lib/engine/vmd_raid_info.h
33index 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--
462.23.0
47