From 5f96eba22d20b9d30f4afc9ba07ef9e95cffb0dc Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 23 Sep 2005 13:11:04 +0000 Subject: [PATCH] Use non-pure virtual destructors --- include/yaz++/pdu-observer.h | 6 ++--- include/yaz++/query.h | 6 ++--- include/yaz++/socket-observer.h | 54 +++++++++++++++++++-------------------- src/yaz-pdu-assoc.cpp | 4 +-- zlint/zlint.h | 4 +-- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/yaz++/pdu-observer.h b/include/yaz++/pdu-observer.h index 2b90a8b..965ffee 100644 --- a/include/yaz++/pdu-observer.h +++ b/include/yaz++/pdu-observer.h @@ -2,7 +2,7 @@ * Copyright (c) 1998-2005, Index Data. * See the file LICENSE for details. * - * $Id: pdu-observer.h,v 1.8 2005-09-22 12:40:45 adam Exp $ + * $Id: pdu-observer.h,v 1.9 2005-09-23 13:11:04 adam Exp $ */ #ifndef YAZ_PDU_OBSERVER_H @@ -39,7 +39,7 @@ class YAZ_EXPORT IPDU_Observable { /// Get peername virtual const char *getpeername() = 0; - virtual ~IPDU_Observable() = 0; + virtual ~IPDU_Observable(); }; /** Protocol Data Unit Observer. @@ -60,7 +60,7 @@ class YAZ_EXPORT IPDU_Observer { virtual IPDU_Observer *sessionNotify( IPDU_Observable *the_PDU_Observable, int fd) = 0; - virtual ~IPDU_Observer() = 0; + virtual ~IPDU_Observer(); }; }; diff --git a/include/yaz++/query.h b/include/yaz++/query.h index 7ec2f4d..d27a33c 100644 --- a/include/yaz++/query.h +++ b/include/yaz++/query.h @@ -1,8 +1,8 @@ /* - * Copyright (c) 1998-2000, Index Data. + * Copyright (c) 1998-2005, Index Data. * See the file LICENSE for details. * - * $Id: query.h,v 1.4 2005-09-22 12:40:45 adam Exp $ + * $Id: query.h,v 1.5 2005-09-23 13:11:04 adam Exp $ */ #ifndef YAZ_PP_QUERY_H @@ -18,7 +18,7 @@ class YAZ_EXPORT Yaz_Query { public: /// Print query in buffer described by str and len virtual void print (char *str, int len) = 0; - virtual ~Yaz_Query() = 0; + virtual ~Yaz_Query(); }; }; diff --git a/include/yaz++/socket-observer.h b/include/yaz++/socket-observer.h index bd2425c..fee5088 100644 --- a/include/yaz++/socket-observer.h +++ b/include/yaz++/socket-observer.h @@ -2,7 +2,7 @@ * Copyright (c) 1998-2005, Index Data. * See the file LICENSE for details. * - * $Id: socket-observer.h,v 1.7 2005-09-22 12:40:45 adam Exp $ + * $Id: socket-observer.h,v 1.8 2005-09-23 13:11:04 adam Exp $ */ #ifndef YAZ_SOCKET_OBSERVER_H @@ -41,34 +41,34 @@ namespace yazpp_1 { The maskObserver method specifies which of these events the observer is intertested in. */ -class YAZ_EXPORT ISocketObservable { - public: - /// Add an observer interested in socket fd - virtual void addObserver(int fd, ISocketObserver *observer) = 0; - /// Delete an observer - virtual void deleteObserver(ISocketObserver *observer) = 0; - /// Delete all observers - virtual void deleteObservers() = 0; - /// Specify the events that the observer is intersted in. - virtual void maskObserver(ISocketObserver *observer, int mask) = 0; - /// Specify timeout - virtual void timeoutObserver(ISocketObserver *observer, - int timeout)=0; - virtual ~ISocketObservable() = 0; -}; - + class YAZ_EXPORT ISocketObservable { + public: + /// Add an observer interested in socket fd + virtual void addObserver(int fd, ISocketObserver *observer) = 0; + /// Delete an observer + virtual void deleteObserver(ISocketObserver *observer) = 0; + /// Delete all observers + virtual void deleteObservers() = 0; + /// Specify the events that the observer is intersted in. + virtual void maskObserver(ISocketObserver *observer, int mask) = 0; + /// Specify timeout + virtual void timeoutObserver(ISocketObserver *observer, + int timeout)=0; + virtual ~ISocketObservable(); + }; + /** Socket Observer. - The ISocketObserver interface implements a module interested - socket events. Look for objects that implements the - ISocketObservable interface! + The ISocketObserver interface implements a module interested + socket events. Look for objects that implements the + ISocketObservable interface! */ -class YAZ_EXPORT ISocketObserver { - public: - /// Notify the observer that something happened to socket - virtual void socketNotify(int event) = 0; - virtual ~ISocketObserver() = 0; -}; - + class YAZ_EXPORT ISocketObserver { + public: + /// Notify the observer that something happened to socket + virtual void socketNotify(int event) = 0; + virtual ~ISocketObserver(); + }; + }; #endif /* diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp index 5a41980..d92f2ec 100644 --- a/src/yaz-pdu-assoc.cpp +++ b/src/yaz-pdu-assoc.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-pdu-assoc.cpp,v 1.43 2005-06-25 15:53:19 adam Exp $ + * $Id: yaz-pdu-assoc.cpp,v 1.44 2005-09-23 13:11:04 adam Exp $ */ #include @@ -38,7 +38,7 @@ PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable) } PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable, - COMSTACK cs) + COMSTACK cs) { init(socketObservable); m_cs = cs; diff --git a/zlint/zlint.h b/zlint/zlint.h index 7ee796b..5f898d2 100644 --- a/zlint/zlint.h +++ b/zlint/zlint.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005, Index Data. * See the file LICENSE for details. * - * $Id: zlint.h,v 1.5 2005-09-22 12:40:45 adam Exp $ + * $Id: zlint.h,v 1.6 2005-09-23 13:11:04 adam Exp $ */ #include @@ -51,7 +51,7 @@ public: virtual Zlint_code init(Zlint *z) = 0; virtual Zlint_code recv_gdu(Zlint *z, Z_GDU *gdu) = 0; virtual Zlint_code recv_fail(Zlint *z, int reason) = 0; - virtual ~Zlint_test() = 0; + virtual ~Zlint_test(); }; class Zlint_test_simple : public Zlint_test { -- 1.7.10.4