Socket: BUGFIX: Move incorrect v-function call out of FileBody destructor

[senf.git] / Socket / FileHandle.ih

diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index bd5b1c7..e87e319 100644 (file)
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
 
 namespace senf {
 
+    class FileHandle;
 
     /** \brief FileHandle referenced body
 
@@ -82,7 +83,10 @@ namespace senf {
                                            constructor not some arbitrary id even if you overload
                                            all the virtual members. If the file descriptor is -1 the
                                            resulting body/handle is not valid() */
-        virtual ~FileBody();
+
+        // NO DESTRUCTOR HERE - destructors and virtual functions don't mix. What would be in the
+        // the destructor is in 'destroyClose()' which is called from FileHandle::~FileHandle()
+        // *before* the last handle dies.
 
         // no copy
         // no conversion constructors
@@ -90,11 +94,14 @@ namespace senf {
         ///@}
         ///////////////////////////////////////////////////////////////////////////
 
+        FileHandle handle();
+
         int fd() const;
         void fd(int fd);
 
         void close();
         void terminate();
+        void destroyClose();
 
         bool readable() const;
         void waitReadable() const;