The following commit has been merged in the master branch:
commit 3f722ca94c61af48b4251e5092f5874683dd2e53
Author: Andrei Zavada <[email protected]>
Date: Thu Jul 11 02:03:17 2013 +0300
don't call save_ancillary_files() from CSource dtor
diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index 281cb3e..827c7ab 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -370,6 +370,9 @@ CEDFFile (CEDFFile&& rv)
CEDFFile::
~CEDFFile ()
{
+ if ( not (_flags & no_ancillary_files) )
+ save_ancillary_files();
+
if ( _mmapping != (void*)-1 ) {
munmap( _mmapping, _fsize);
close( _fd);
diff --git a/src/libsigfile/source-base.hh b/src/libsigfile/source-base.hh
index 98df897..c35bc5a 100644
--- a/src/libsigfile/source-base.hh
+++ b/src/libsigfile/source-base.hh
@@ -247,8 +247,9 @@ class CSource {
CSource( CSource&&);
virtual ~CSource()
{
- if ( not (_flags & no_ancillary_files) )
- save_ancillary_files();
+ // if ( not (_flags & no_ancillary_files) )
+ // save_ancillary_files();
+ /// for similar reasons, some methods will revert to
pure when called from CSource dtor
}
int status() const { return _status; }
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
