diff options
| author | dim <dim@FreeBSD.org> | 2016-09-02 17:07:52 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-09-02 17:07:52 +0000 |
| commit | 14930f6acb78811f53cc96887538036a589cb6f2 (patch) | |
| tree | 3b87f778c05773b4d82db4cc3853764708b1f5e8 /cddl | |
| parent | 36cf74926f10a2ef792634878700c0c1035f1a18 (diff) | |
| download | FreeBSD-src-14930f6acb78811f53cc96887538036a589cb6f2.zip FreeBSD-src-14930f6acb78811f53cc96887538036a589cb6f2.tar.gz | |
MFC r305013:
Add an empty virtual destructor to zfsd's Vdev class. This is needed
because the class has virtual functions, and the compiler-generated
default destructor is non-virtual.
Reviewed by: asomers
MFC r305016:
Fix the zfsd unittest:
* TESTSDIR is supposed to be under cddl/usr.sbin, not cddl/sbin
* DevdCtl::EventBuffer no longer exists, so remove its forward
declaration
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/usr.sbin/zfsd/tests/Makefile | 2 | ||||
| -rw-r--r-- | cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc | 1 | ||||
| -rw-r--r-- | cddl/usr.sbin/zfsd/vdev.h | 10 |
3 files changed, 11 insertions, 2 deletions
diff --git a/cddl/usr.sbin/zfsd/tests/Makefile b/cddl/usr.sbin/zfsd/tests/Makefile index 2a6ffb5..8eab505 100644 --- a/cddl/usr.sbin/zfsd/tests/Makefile +++ b/cddl/usr.sbin/zfsd/tests/Makefile @@ -4,7 +4,7 @@ SRCDIR=${.CURDIR}/../../../.. .include "${.CURDIR}/../Makefile.common" .PATH: ${.CURDIR}/.. -TESTSDIR?= ${TESTSBASE}/cddl/sbin/zfsd +TESTSDIR?= ${TESTSBASE}/cddl/usr.sbin/zfsd PLAIN_TESTS_CXX= zfsd_unittest SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc} diff --git a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc index 9a2384a..e1b3b1e 100644 --- a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc +++ b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc @@ -72,7 +72,6 @@ using std::string; using std::stringstream; using DevdCtl::Event; -using DevdCtl::EventBuffer; using DevdCtl::EventFactory; using DevdCtl::EventList; using DevdCtl::Guid; diff --git a/cddl/usr.sbin/zfsd/vdev.h b/cddl/usr.sbin/zfsd/vdev.h index 2fd4d4f..322efc8 100644 --- a/cddl/usr.sbin/zfsd/vdev.h +++ b/cddl/usr.sbin/zfsd/vdev.h @@ -108,6 +108,12 @@ public: * \brief No-op copy constructor for nonexistent vdevs. */ Vdev(); + + /** + * \brief No-op virtual destructor, since this class has virtual + * functions. + */ + virtual ~Vdev(); bool DoesNotExist() const; /** @@ -145,6 +151,10 @@ private: extern Vdev NonexistentVdev; //- Vdev Inline Public Methods ------------------------------------------------ +inline Vdev::~Vdev() +{ +} + inline DevdCtl::Guid Vdev::PoolGUID() const { |
