From 1fd32277c16d262049ce35d3f0243f4cb2b2c25f Mon Sep 17 00:00:00 2001 From: fekir Date: Mon, 21 Aug 2017 22:01:21 +0200 Subject: [PATCH] Remove unnecessary noexcept identifier from destructors --- include/SQLiteCpp/Backup.h | 2 +- include/SQLiteCpp/Column.h | 2 +- include/SQLiteCpp/Database.h | 2 +- include/SQLiteCpp/Statement.h | 4 ++-- include/SQLiteCpp/Transaction.h | 2 +- src/Backup.cpp | 2 +- src/Column.cpp | 2 +- src/Database.cpp | 2 +- src/Statement.cpp | 4 ++-- src/Transaction.cpp | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/SQLiteCpp/Backup.h b/include/SQLiteCpp/Backup.h index 52096c1..5cc379d 100644 --- a/include/SQLiteCpp/Backup.h +++ b/include/SQLiteCpp/Backup.h @@ -100,7 +100,7 @@ public: Database& aSrcDatabase); /// Release the SQLite Backup resource. - virtual ~Backup() noexcept; + virtual ~Backup(); /** * @brief Execute a step of backup with a given number of source pages to be copied diff --git a/include/SQLiteCpp/Column.h b/include/SQLiteCpp/Column.h index 041a9a9..1004fb9 100644 --- a/include/SQLiteCpp/Column.h +++ b/include/SQLiteCpp/Column.h @@ -54,7 +54,7 @@ public: */ Column(Statement::Ptr& aStmtPtr, int aIndex) noexcept; // nothrow /// Simple destructor - virtual ~Column() noexcept; // nothrow + virtual ~Column(); // default copy constructor and assignment operator are perfectly suited : // they copy the Statement::Ptr which in turn increments the reference counter. diff --git a/include/SQLiteCpp/Database.h b/include/SQLiteCpp/Database.h index b7d87bd..764a0c6 100644 --- a/include/SQLiteCpp/Database.h +++ b/include/SQLiteCpp/Database.h @@ -127,7 +127,7 @@ public: * * @warning assert in case of error */ - virtual ~Database() noexcept; // nothrow + virtual ~Database(); /** * @brief Set a busy handler that sleeps for a specified amount of time when a table is locked. diff --git a/include/SQLiteCpp/Statement.h b/include/SQLiteCpp/Statement.h index 030eab9..07ae972 100644 --- a/include/SQLiteCpp/Statement.h +++ b/include/SQLiteCpp/Statement.h @@ -73,7 +73,7 @@ public: Statement(Database& aDatabase, const std::string& aQuery); /// Finalize and unregister the SQL query from the SQLite Database Connection. - virtual ~Statement() noexcept; // nothrow + virtual ~Statement(); /// Reset the statement to make it ready for a new execution. void reset(); @@ -564,7 +564,7 @@ private: // Copy constructor increments the ref counter Ptr(const Ptr& aPtr); // Decrement the ref counter and finalize the sqlite3_stmt when it reaches 0 - ~Ptr() noexcept; // nothrow (no virtual destructor needed here) + ~Ptr(); /// Inline cast operator returning the pointer to SQLite Database Connection Handle inline operator sqlite3*() const diff --git a/include/SQLiteCpp/Transaction.h b/include/SQLiteCpp/Transaction.h index 1e6b4e9..cc50591 100644 --- a/include/SQLiteCpp/Transaction.h +++ b/include/SQLiteCpp/Transaction.h @@ -55,7 +55,7 @@ public: /** * @brief Safely rollback the transaction if it has not been committed. */ - virtual ~Transaction() noexcept; // nothrow + virtual ~Transaction(); /** * @brief Commit the transaction. diff --git a/src/Backup.cpp b/src/Backup.cpp index f8fd58a..8b81be0 100644 --- a/src/Backup.cpp +++ b/src/Backup.cpp @@ -70,7 +70,7 @@ Backup::Backup(Database &aDestDatabase, Database &aSrcDatabase) : } // Release resource for SQLite database backup -Backup::~Backup() noexcept +Backup::~Backup() { if (NULL != mpSQLiteBackup) { diff --git a/src/Column.cpp b/src/Column.cpp index ee95e55..2fd999a 100644 --- a/src/Column.cpp +++ b/src/Column.cpp @@ -33,7 +33,7 @@ Column::Column(Statement::Ptr& aStmtPtr, int aIndex) noexcept : // nothrow } // Finalize and unregister the SQL query from the SQLite Database Connection. -Column::~Column() noexcept // nothrow +Column::~Column() { // the finalization will be done by the destructor of the last shared pointer } diff --git a/src/Database.cpp b/src/Database.cpp index 164f3e3..bf440dc 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -92,7 +92,7 @@ Database::Database(const std::string& aFilename, } // Close the SQLite database connection. -Database::~Database() noexcept // nothrow +Database::~Database() { const int ret = sqlite3_close(mpSQLite); diff --git a/src/Statement.cpp b/src/Statement.cpp index 6661c08..f4f430c 100644 --- a/src/Statement.cpp +++ b/src/Statement.cpp @@ -44,7 +44,7 @@ Statement::Statement(Database &aDatabase, const std::string& aQuery) : // Finalize and unregister the SQL query from the SQLite Database Connection. -Statement::~Statement() noexcept // nothrow +Statement::~Statement() { // the finalization will be done by the destructor of the last shared pointer } @@ -437,7 +437,7 @@ Statement::Ptr::Ptr(const Statement::Ptr& aPtr) : /** * @brief Decrement the ref counter and finalize the sqlite3_stmt when it reaches 0 */ -Statement::Ptr::~Ptr() noexcept // nothrow +Statement::Ptr::~Ptr() { assert(NULL != mpRefCount); assert(0 != *mpRefCount); diff --git a/src/Transaction.cpp b/src/Transaction.cpp index 677e82c..eec5103 100644 --- a/src/Transaction.cpp +++ b/src/Transaction.cpp @@ -27,7 +27,7 @@ Transaction::Transaction(Database& aDatabase) : } // Safely rollback the transaction if it has not been committed. -Transaction::~Transaction() noexcept // nothrow +Transaction::~Transaction() { if (false == mbCommited) {