X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.ih;h=b1940c69e34c9896db4027cf218511b24e5eab18;hb=69bcc009d679b71b816b9a1bfd11dfaf6c980fd1;hp=2e69506e0f2333e35c9cc2c252e57b43a38681b8;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git

diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index 2e69506..b1940c6 100644
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// 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
@@ -24,8 +24,8 @@
     \brief FileHandle internal header
  */
 
-#ifndef IH_FileHandle_
-#define IH_FileHandle_ 1
+#ifndef IH_SENF_Socket_FileHandle_
+#define IH_SENF_Socket_FileHandle_ 1
 
 // Custom includes
 #include <boost/intrusive_ptr.hpp>
@@ -85,6 +85,10 @@ namespace senf {
                                            resulting body/handle is not valid() */
         virtual ~FileBody();
 
+        // NO DESTRUCTOR HERE (that is, only an empty virtual destructor) - 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
 
@@ -98,6 +102,7 @@ namespace senf {
 
         void close();
         void terminate();
+        void destroyClose();
 
         bool readable() const;
         void waitReadable() const;