Put the check_access function in Base

[libs/core.git] / source / io / file.cpp

diff --git a/source/io/file.cpp b/source/io/file.cpp
index 0f5652ad9484cf460a2e266f666470c00b67dd02..cc3f0a9e4da52d40fc9893efb984801b1a09d672 100644 (file)
--- a/source/io/file.cpp
+++ b/source/io/file.cpp
@@ -86,26 +86,13 @@ File::File(const string &fn, Mode m, CreateMode cm)
 
 File::~File()
 {
-       close();
-}
-
-void File::close()
-{
-       if(!handle)
-               return;
-
        signal_flush_required.emit();
-
        sys_close(handle);
-
-       handle = Handle();
        signal_closed.emit();
 }
 
 void File::set_block(bool b)
 {
-       check_access(M_NONE);
-
        mode = (mode&~M_NONBLOCK);
        if(b)
                mode = (mode|M_NONBLOCK);
@@ -158,8 +145,6 @@ void File::sync()
 
 SeekOffset File::seek(SeekOffset off, SeekType type)
 {
-       check_access(M_NONE);
-
        signal_flush_required.emit();
        off = sys_seek(handle, off, type);
        eof_flag = false;
@@ -169,16 +154,8 @@ SeekOffset File::seek(SeekOffset off, SeekType type)
 
 SeekOffset File::tell() const
 {
-       check_access(M_NONE);
-
        return sys_seek(const_cast<Handle &>(handle), 0, S_CUR);
 }
 
-void File::check_access(Mode m) const
-{
-       if(!handle || (m && !(mode&m)))
-               throw invalid_access(m);
-}
-
 } // namespace IO
 } // namespace Msp