From 4809ff772a8d1cbc1eb6b0f68b1b532e6b5c804c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Wed, 6 Mar 2019 20:42:48 +0100
Subject: [PATCH] File exceptions replaced with ios exception.
---
src/TNL/Exceptions/FileCloseError.h | 32 -----------------------------
src/TNL/Exceptions/FileOpenError.h | 32 -----------------------------
src/TNL/File.hpp | 22 ++++++++++++++------
3 files changed, 16 insertions(+), 70 deletions(-)
delete mode 100644 src/TNL/Exceptions/FileCloseError.h
delete mode 100644 src/TNL/Exceptions/FileOpenError.h
diff --git a/src/TNL/Exceptions/FileCloseError.h b/src/TNL/Exceptions/FileCloseError.h
deleted file mode 100644
index 3b4a7f973d..0000000000
--- a/src/TNL/Exceptions/FileCloseError.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************
- FileCloseError.h - description
- -------------------
- begin : Mar 5, 2019
- copyright : (C) 2019 by Tomas Oberhuber et al.
- email : tomas.oberhuber@fjfi.cvut.cz
- ***************************************************************************/
-
-/* See Copyright Notice in tnl/Copyright */
-
-// Implemented by: Tomas Oberhuber
-
-#pragma once
-
-#include <string>
-#include <stdexcept>
-#include <TNL/String.h>
-
-namespace TNL {
-namespace Exceptions {
-
-class FileCloseError
- : public std::runtime_error
-{
-public:
- FileCloseError( const String& fileName )
- : std::runtime_error( "An error occurred when closing file " + fileName + "." )
- {}
-};
-
-} // namespace Exceptions
-} // namespace TNL
diff --git a/src/TNL/Exceptions/FileOpenError.h b/src/TNL/Exceptions/FileOpenError.h
deleted file mode 100644
index 3975c267e6..0000000000
--- a/src/TNL/Exceptions/FileOpenError.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************
- FileOpenError.h - description
- -------------------
- begin : Mar 5, 2019
- copyright : (C) 2019 by Tomas Oberhuber et al.
- email : tomas.oberhuber@fjfi.cvut.cz
- ***************************************************************************/
-
-/* See Copyright Notice in tnl/Copyright */
-
-// Implemented by: Tomas Oberhuber
-
-#pragma once
-
-#include <string>
-#include <stdexcept>
-#include <TNL/String.h>
-
-namespace TNL {
-namespace Exceptions {
-
-class FileOpenError
- : public std::runtime_error
-{
-public:
- FileOpenError( const String& fileName )
- : std::runtime_error( "Unable to open file " + fileName + "." )
- {}
-};
-
-} // namespace Exceptions
-} // namespace TNL
diff --git a/src/TNL/File.hpp b/src/TNL/File.hpp
index 5cc7f01aa1..1db792bd5c 100644
--- a/src/TNL/File.hpp
+++ b/src/TNL/File.hpp
@@ -12,6 +12,8 @@
#include <memory>
#include <iostream>
+#include <ios>
+#include <sstream>
#include <TNL/File.h>
#include <TNL/Assert.h>
@@ -19,8 +21,6 @@
#include <TNL/Exceptions/MICSupportMissing.h>
#include <TNL/Exceptions/FileSerializationError.h>
#include <TNL/Exceptions/FileDeserializationError.h>
-#include <TNL/Exceptions/FileOpenError.h>
-#include <TNL/Exceptions/FileCloseError.h>
namespace TNL {
@@ -45,9 +45,16 @@ inline void File::open( const String& fileName, Mode mode )
{
file.open( fileName.getString(), ios_mode );
}
- catch(...)
+ catch( std::ios_base::failure )
{
- throw Exceptions::FileOpenError( fileName );
+ std::stringstream msg;
+ msg << "Unable to open file " << fileName << " ";
+ if( mode & Mode::In )
+ msg << " for reading.";
+ if( mode & Mode::Out )
+ msg << " for writting.";
+
+ throw std::ios_base::failure( msg.str() );
}
this->fileName = fileName;
@@ -61,9 +68,12 @@ inline void File::close()
{
file.close();
}
- catch(...)
+ catch( std::ios_base::failure )
{
- throw Exceptions::FileCloseError( fileName );
+ std::stringstream msg;
+ msg << "Unable to close file " << fileName << ".";
+
+ throw std::ios_base::failure( msg.str() );
}
}
// reset file name
--
GitLab