From nobody Thu Jun 29 11:36:14 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QsGcH01yKz4kQV2; Thu, 29 Jun 2023 11:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QsGcG6wY0z3mJg; Thu, 29 Jun 2023 11:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688038574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xrVpj0BgGEguQvoNd3fiDofCiKPRx1ICufqVUlQE+Y=; b=xBjEWyivSdGu3db8V7Ovbro43BTph3KbrkRFnfcU2U9yKXww5YDmASUlIUQe9HBat9BOzt qCT/x0fPtzzAhWS1gPrhz23xkHJKcgmj+OvWvP+4D65xILED0jWP8VEEerQ67a90et4/WE c0I26PZhnNUEh84K3wj2iQTu1hxpfXv1UNj7PMFCOvyaUTxmrKf6kBS9fDAdVTOk31lwgf 4Uax8CJk+sF0Y11UJ0PKImS+rTFD09dInudIqPk6wl2Q1bbUxcmZ0QBZD0w3w+pZNOj48a nZEGxteYrhbU+C4cTBd80iP/blaW0Ub/dI8fNS+GLc64/rzlZ13fHv4n6dYRwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688038574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xrVpj0BgGEguQvoNd3fiDofCiKPRx1ICufqVUlQE+Y=; b=r5MXXBb0YG+WIPKLKTSsFcbF3EmGu/0tQbtFHoZwsMzJxTvcBD+j0pZccG8CDFhNDHBx3G N83lahvuhiEShhfvBGwogTlc4e6z/vwZznuAVE54TwLw+pxj4oMx7/Ud7DPugBNk8sdCQT sIfyhrlHYS1/jZPP9FplgXagvW6xs/ah3fGoY6uG2A9eWUyzhkIaufdFfH7tEwkZhYPbQy X8TY/tZ2Qpiz4fLCnk8WsyOGTvGPJoG+Ui2CXHp6/KOGYJ9x/klGLCJ9v4zaIbLerdH+LT 9uH1DAVxQp0ApmN37i1u1oiwiLQh+GDDcjW0B0CTUipT9/lzNUBwuSEmZcKJwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688038574; a=rsa-sha256; cv=none; b=fDKM6NaZWVRDWZni4qXJJLnEwSzeTJMn5cPMng7hDfzcmoxTOBsJzjc9IYsU7scS20CrsM UosONEbtjZj0YqP4M40h2n5gaj6GsISHuOa/etaQPEznfgsEwycIuIXnW8lAO2CxAxpRq7 54WlgKCvrTWD3C6IMHPJk0QsBo1FrytPgyX6xFZwAObTpec96ny9Ek4/G6x7Kk0a6/WIPd BbOg7Heqahi3/IO7OIJM+S+N0+i1EsVCaFSjMmRTNpT/bUpW7SQ1yyxgEfGY9celBCD3Xl vSzirpG74BWx7UdjGKKuLFn2gt+dHKF2A7Pf5LKMJub5badZjdt77aGKHD8OMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QsGcG5yYlzF1k; Thu, 29 Jun 2023 11:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35TBaE4J006107; Thu, 29 Jun 2023 11:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35TBaE5N006106; Thu, 29 Jun 2023 11:36:14 GMT (envelope-from git) Date: Thu, 29 Jun 2023 11:36:14 GMT Message-Id: <202306291136.35TBaE5N006106@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: cf2a904c0339 - main - databases/opendbx: fix build on 14.0-CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf2a904c0339511209d56b05e948db87cdd15acb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf2a904c0339511209d56b05e948db87cdd15acb commit cf2a904c0339511209d56b05e948db87cdd15acb Author: Ralf van der Enden AuthorDate: 2023-06-28 10:03:12 +0000 Commit: Fernando Apesteguía CommitDate: 2023-06-29 11:35:58 +0000 databases/opendbx: fix build on 14.0-CURRENT Change "throw( std::exception )" to "noexcept(false)' to make it build on 14.0-CURRENT (which defaults to c++17) PR: 272233 Reported by: tremere@cainites.net (maintainer) --- databases/opendbx/files/patch-lib_odbx.cpp | 268 +++++++++++++++++++++ databases/opendbx/files/patch-lib_odbx__iface.hpp | 87 +++++++ databases/opendbx/files/patch-lib_odbx__impl.cpp | 279 +++++++++++++++++++++ databases/opendbx/files/patch-lib_odbx__impl.hpp | 128 ++++++++++ databases/opendbx/files/patch-lib_opendbx_api | 281 ++++++++++++++++++++++ 5 files changed, 1043 insertions(+) diff --git a/databases/opendbx/files/patch-lib_odbx.cpp b/databases/opendbx/files/patch-lib_odbx.cpp new file mode 100644 index 000000000000..339712693da0 --- /dev/null +++ b/databases/opendbx/files/patch-lib_odbx.cpp @@ -0,0 +1,268 @@ +--- lib/odbx.cpp.orig 2010-08-01 02:08:41 UTC ++++ lib/odbx.cpp +@@ -54,7 +54,7 @@ namespace OpenDBX + * OpenDBX large object interface + */ + +- Lob::Lob( Lob_Iface* impl ) throw( std::exception ) ++ Lob::Lob( Lob_Iface* impl ) noexcept(false) + { + m_impl = impl; + m_ref = new int; +@@ -114,21 +114,21 @@ namespace OpenDBX + + + +- void Lob::close() throw( std::exception ) ++ void Lob::close() noexcept(false) + { + return m_impl->close(); + } + + + +- ssize_t Lob::read( void* buffer, size_t buflen ) throw( std::exception ) ++ ssize_t Lob::read( void* buffer, size_t buflen ) noexcept(false) + { + return m_impl->read( buffer, buflen ); + } + + + +- ssize_t Lob::write( void* buffer, size_t buflen ) throw( std::exception ) ++ ssize_t Lob::write( void* buffer, size_t buflen ) noexcept(false) + { + return m_impl->write( buffer, buflen ); + } +@@ -143,7 +143,7 @@ namespace OpenDBX + + + +- Result::Result( Result_Iface* impl ) throw( std::exception ) ++ Result::Result( Result_Iface* impl ) noexcept(false) + { + m_impl = impl; + m_ref = new int; +@@ -204,76 +204,76 @@ namespace OpenDBX + + + +- void Result::finish() throw( std::exception ) ++ void Result::finish() noexcept(false) + { + return m_impl->finish(); + } + + + +- odbxres Result::getResult( struct timeval* timeout, unsigned long chunk ) throw( std::exception ) ++ odbxres Result::getResult( struct timeval* timeout, unsigned long chunk ) noexcept(false) + { + return m_impl->getResult( timeout, chunk ); + } + + + +- odbxrow Result::getRow() throw( std::exception ) ++ odbxrow Result::getRow() noexcept(false) + { + return m_impl->getRow(); + } + + + +- uint64_t Result::rowsAffected() throw( std::exception ) ++ uint64_t Result::rowsAffected() noexcept(false) + { + return m_impl->rowsAffected(); + } + + + +- unsigned long Result::columnCount() throw( std::exception ) ++ unsigned long Result::columnCount() noexcept(false) + { + return m_impl->columnCount(); + } + + + +- unsigned long Result::columnPos( const string& name ) throw( std::exception ) ++ unsigned long Result::columnPos( const string& name ) noexcept(false) + { + return m_impl->columnPos( name ); + } + + + +- const string Result::columnName( unsigned long pos ) throw( std::exception ) ++ const string Result::columnName( unsigned long pos ) noexcept(false) + { + return m_impl->columnName( pos ); + } + + + +- odbxtype Result::columnType( unsigned long pos ) throw( std::exception ) ++ odbxtype Result::columnType( unsigned long pos ) noexcept(false) + { + return m_impl->columnType( pos ); + } + + + +- unsigned long Result::fieldLength( unsigned long pos ) throw( std::exception ) ++ unsigned long Result::fieldLength( unsigned long pos ) noexcept(false) + { + return m_impl->fieldLength( pos ); + } + + + +- const char* Result::fieldValue( unsigned long pos ) throw( std::exception ) ++ const char* Result::fieldValue( unsigned long pos ) noexcept(false) + { + return m_impl->fieldValue( pos ); + } + + +- Lob Result::getLob( const char* value ) throw( std::exception ) ++ Lob Result::getLob( const char* value ) noexcept(false) + { + return m_impl->getLob( value ); + } +@@ -288,7 +288,7 @@ namespace OpenDBX + + + +- Stmt::Stmt( Stmt_Iface* impl ) throw( std::exception ) ++ Stmt::Stmt( Stmt_Iface* impl ) noexcept(false) + { + m_impl = impl; + m_ref = new int; +@@ -363,7 +363,7 @@ namespace OpenDBX + + + +- Result Stmt::execute() throw( std::exception ) ++ Result Stmt::execute() noexcept(false) + { + return Result( m_impl->execute() ); + } +@@ -384,7 +384,7 @@ namespace OpenDBX + } + + +- Conn::Conn( const char* backend, const char* host, const char* port ) throw( std::exception ) ++ Conn::Conn( const char* backend, const char* host, const char* port ) noexcept(false) + { + m_impl = new Conn_Impl( backend, host, port ); + m_ref = new int; +@@ -393,7 +393,7 @@ namespace OpenDBX + } + + +- Conn::Conn( const string& backend, const string& host, const string& port ) throw( std::exception ) ++ Conn::Conn( const string& backend, const string& host, const string& port ) noexcept(false) + { + m_impl = new Conn_Impl( backend.c_str(), host.c_str(), port.c_str() ); + m_ref = new int; +@@ -454,7 +454,7 @@ namespace OpenDBX + + + +- void Conn::bind( const char* database, const char* who, const char* cred, odbxbind method ) throw( std::exception ) ++ void Conn::bind( const char* database, const char* who, const char* cred, odbxbind method ) noexcept(false) + { + if( m_impl == NULL ) + { +@@ -466,7 +466,7 @@ namespace OpenDBX + + + +- void Conn::bind( const string& database, const string& who, const string& cred, odbxbind method ) throw( std::exception ) ++ void Conn::bind( const string& database, const string& who, const string& cred, odbxbind method ) noexcept(false) + { + if( m_impl == NULL ) + { +@@ -478,7 +478,7 @@ namespace OpenDBX + + + +- void Conn::unbind() throw( std::exception ) ++ void Conn::unbind() noexcept(false) + { + if( m_impl == NULL ) + { +@@ -490,7 +490,7 @@ namespace OpenDBX + + + +- void Conn::finish() throw( std::exception ) ++ void Conn::finish() noexcept(false) + { + if( m_impl == NULL ) + { +@@ -502,7 +502,7 @@ namespace OpenDBX + + + +- bool Conn::getCapability( odbxcap cap ) throw( std::exception ) ++ bool Conn::getCapability( odbxcap cap ) noexcept(false) + { + if( m_impl == NULL ) + { +@@ -514,7 +514,7 @@ namespace OpenDBX + + + +- void Conn::getOption( odbxopt option, void* value ) throw( std::exception ) ++ void Conn::getOption( odbxopt option, void* value ) noexcept(false) + { + if( m_impl == NULL ) + { +@@ -526,7 +526,7 @@ namespace OpenDBX + + + +- void Conn::setOption( odbxopt option, void* value ) throw( std::exception ) ++ void Conn::setOption( odbxopt option, void* value ) noexcept(false) + { + if( m_impl == NULL ) + { +@@ -538,7 +538,7 @@ namespace OpenDBX + + + +- string& Conn::escape( const string& from, string& to ) throw( std::exception ) ++ string& Conn::escape( const string& from, string& to ) noexcept(false) + { + if( m_impl == NULL ) + { +@@ -550,7 +550,7 @@ namespace OpenDBX + + + +- string& Conn::escape( const char* from, unsigned long fromlen, string& to ) throw( std::exception ) ++ string& Conn::escape( const char* from, unsigned long fromlen, string& to ) noexcept(false) + { + if( m_impl == NULL ) + { +@@ -562,7 +562,7 @@ namespace OpenDBX + + + +- Stmt Conn::create( const char* sql, unsigned long length, Stmt::Type type ) throw( std::exception ) ++ Stmt Conn::create( const char* sql, unsigned long length, Stmt::Type type ) noexcept(false) + { + if( length == 0 ) { length = (unsigned long) strlen( sql ); } + +@@ -571,7 +571,7 @@ namespace OpenDBX + + + +- Stmt Conn::create( const string& sql, Stmt::Type type ) throw( std::exception ) ++ Stmt Conn::create( const string& sql, Stmt::Type type ) noexcept(false) + { + if( m_impl == NULL ) + { diff --git a/databases/opendbx/files/patch-lib_odbx__iface.hpp b/databases/opendbx/files/patch-lib_odbx__iface.hpp new file mode 100644 index 000000000000..cc7e4ba9f79a --- /dev/null +++ b/databases/opendbx/files/patch-lib_odbx__iface.hpp @@ -0,0 +1,87 @@ +--- lib/odbx_iface.hpp.orig 2010-08-01 02:08:41 UTC ++++ lib/odbx_iface.hpp +@@ -27,10 +27,10 @@ namespace OpenDBX + public: + + virtual ~Lob_Iface() throw() {} +- virtual void close() throw( std::exception ) = 0; ++ virtual void close() noexcept(false) = 0; + +- virtual ssize_t read( void* buffer, size_t buflen ) throw( std::exception ) = 0; +- virtual ssize_t write( void* buffer, size_t buflen ) throw( std::exception ) = 0; ++ virtual ssize_t read( void* buffer, size_t buflen ) noexcept(false) = 0; ++ virtual ssize_t write( void* buffer, size_t buflen ) noexcept(false) = 0; + }; + + +@@ -40,22 +40,22 @@ namespace OpenDBX + public: + + virtual ~Result_Iface() throw() {} +- virtual void finish() throw( std::exception ) = 0; ++ virtual void finish() noexcept(false) = 0; + +- virtual odbxres getResult( struct timeval* timeout, unsigned long chunk ) throw( std::exception ) = 0; ++ virtual odbxres getResult( struct timeval* timeout, unsigned long chunk ) noexcept(false) = 0; + +- virtual odbxrow getRow() throw( std::exception ) = 0; +- virtual uint64_t rowsAffected() throw( std::exception ) = 0; ++ virtual odbxrow getRow() noexcept(false) = 0; ++ virtual uint64_t rowsAffected() noexcept(false) = 0; + +- virtual unsigned long columnCount() throw( std::exception ) = 0; +- virtual unsigned long columnPos( const string& name ) throw( std::exception ) = 0; +- virtual const string columnName( unsigned long pos ) throw( std::exception ) = 0; +- virtual odbxtype columnType( unsigned long pos ) throw( std::exception ) = 0; ++ virtual unsigned long columnCount() noexcept(false) = 0; ++ virtual unsigned long columnPos( const string& name ) noexcept(false) = 0; ++ virtual const string columnName( unsigned long pos ) noexcept(false) = 0; ++ virtual odbxtype columnType( unsigned long pos ) noexcept(false) = 0; + +- virtual unsigned long fieldLength( unsigned long pos ) throw( std::exception ) = 0; +- virtual const char* fieldValue( unsigned long pos ) throw( std::exception ) = 0; ++ virtual unsigned long fieldLength( unsigned long pos ) noexcept(false) = 0; ++ virtual const char* fieldValue( unsigned long pos ) noexcept(false) = 0; + +- virtual Lob_Iface* getLob( const char* value ) throw( std::exception ) = 0; ++ virtual Lob_Iface* getLob( const char* value ) noexcept(false) = 0; + }; + + +@@ -65,7 +65,7 @@ namespace OpenDBX + public: + + virtual ~Stmt_Iface() throw() {}; +- virtual Result_Iface* execute() throw( std::exception ) = 0; ++ virtual Result_Iface* execute() noexcept(false) = 0; + + // virtual void bind( const void* data, unsigned long size, size_t pos, int flags ) = 0; + // virtual size_t count() = 0; +@@ -78,19 +78,19 @@ namespace OpenDBX + public: + + virtual ~Conn_Iface() throw() {}; +- virtual void finish() throw( std::exception ) = 0; ++ virtual void finish() noexcept(false) = 0; + +- virtual void bind( const char* database, const char* who, const char* cred, odbxbind method = ODBX_BIND_SIMPLE ) throw( std::exception ) = 0; +- virtual void unbind() throw( std::exception ) = 0; ++ virtual void bind( const char* database, const char* who, const char* cred, odbxbind method = ODBX_BIND_SIMPLE ) noexcept(false) = 0; ++ virtual void unbind() noexcept(false) = 0; + +- virtual bool getCapability( odbxcap cap ) throw( std::exception ) = 0; ++ virtual bool getCapability( odbxcap cap ) noexcept(false) = 0; + +- virtual void getOption( odbxopt option, void* value ) throw( std::exception ) = 0; +- virtual void setOption( odbxopt option, void* value ) throw( std::exception ) = 0; ++ virtual void getOption( odbxopt option, void* value ) noexcept(false) = 0; ++ virtual void setOption( odbxopt option, void* value ) noexcept(false) = 0; + +- virtual string& escape( const char* from, unsigned long fromlen, string& to ) throw( std::exception ) = 0; ++ virtual string& escape( const char* from, unsigned long fromlen, string& to ) noexcept(false) = 0; + +- virtual Stmt_Iface* create( const string& sql, Stmt::Type type ) throw( std::exception ) = 0; ++ virtual Stmt_Iface* create( const string& sql, Stmt::Type type ) noexcept(false) = 0; + }; + + } // namespace diff --git a/databases/opendbx/files/patch-lib_odbx__impl.cpp b/databases/opendbx/files/patch-lib_odbx__impl.cpp new file mode 100644 index 000000000000..42d698d833b6 --- /dev/null +++ b/databases/opendbx/files/patch-lib_odbx__impl.cpp @@ -0,0 +1,279 @@ +--- lib/odbx_impl.cpp.orig 2012-06-10 21:20:25 UTC ++++ lib/odbx_impl.cpp +@@ -29,7 +29,7 @@ namespace OpenDBX + * OpenDBX large object implementation + */ + +- Lob_Impl::Lob_Impl( odbx_result_t* result, const char* value ) throw( std::exception ) ++ Lob_Impl::Lob_Impl( odbx_result_t* result, const char* value ) noexcept(false) + { + int err; + +@@ -52,7 +52,7 @@ namespace OpenDBX + + + +- void Lob_Impl::close() throw( std::exception ) ++ void Lob_Impl::close() noexcept(false) + { + int err; + +@@ -66,7 +66,7 @@ namespace OpenDBX + + + +- ssize_t Lob_Impl::read( void* buffer, size_t buflen ) throw( std::exception ) ++ ssize_t Lob_Impl::read( void* buffer, size_t buflen ) noexcept(false) + { + ssize_t err; + +@@ -80,7 +80,7 @@ namespace OpenDBX + + + +- ssize_t Lob_Impl::write( void* buffer, size_t buflen ) throw( std::exception ) ++ ssize_t Lob_Impl::write( void* buffer, size_t buflen ) noexcept(false) + { + ssize_t err; + +@@ -102,7 +102,7 @@ namespace OpenDBX + + + +- Result_Impl::Result_Impl( odbx_t* handle ) throw( std::exception ) ++ Result_Impl::Result_Impl( odbx_t* handle ) noexcept(false) + { + m_handle = handle; + m_result = NULL; +@@ -121,7 +121,7 @@ namespace OpenDBX + + + +- void Result_Impl::finish() throw( std::exception ) ++ void Result_Impl::finish() noexcept(false) + { + odbxres res; + +@@ -137,7 +137,7 @@ namespace OpenDBX + + + +- odbxres Result_Impl::getResult( struct timeval* timeout, unsigned long chunk ) throw( std::exception ) ++ odbxres Result_Impl::getResult( struct timeval* timeout, unsigned long chunk ) noexcept(false) + { + int err; + +@@ -162,7 +162,7 @@ namespace OpenDBX + + + +- odbxrow Result_Impl::getRow() throw( std::exception ) ++ odbxrow Result_Impl::getRow() noexcept(false) + { + int err; + +@@ -176,21 +176,21 @@ namespace OpenDBX + + + +- uint64_t Result_Impl::rowsAffected() throw( std::exception ) ++ uint64_t Result_Impl::rowsAffected() noexcept(false) + { + return odbx_rows_affected( m_result ); + } + + + +- unsigned long Result_Impl::columnCount() throw( std::exception ) ++ unsigned long Result_Impl::columnCount() noexcept(false) + { + return odbx_column_count( m_result ); + } + + + +- unsigned long Result_Impl::columnPos( const string& name ) throw( std::exception ) ++ unsigned long Result_Impl::columnPos( const string& name ) noexcept(false) + { + map::const_iterator it; + +@@ -213,7 +213,7 @@ namespace OpenDBX + + + +- const string Result_Impl::columnName( unsigned long pos ) throw( std::exception ) ++ const string Result_Impl::columnName( unsigned long pos ) noexcept(false) + { + if( pos < odbx_column_count( m_result ) ) + { +@@ -230,7 +230,7 @@ namespace OpenDBX + + + +- odbxtype Result_Impl::columnType( unsigned long pos ) throw( std::exception ) ++ odbxtype Result_Impl::columnType( unsigned long pos ) noexcept(false) + { + if( pos < odbx_column_count( m_result ) ) + { +@@ -242,7 +242,7 @@ namespace OpenDBX + + + +- unsigned long Result_Impl::fieldLength( unsigned long pos ) throw( std::exception ) ++ unsigned long Result_Impl::fieldLength( unsigned long pos ) noexcept(false) + { + if( pos < odbx_column_count( m_result ) ) + { +@@ -254,7 +254,7 @@ namespace OpenDBX + + + +- const char* Result_Impl::fieldValue( unsigned long pos ) throw( std::exception ) ++ const char* Result_Impl::fieldValue( unsigned long pos ) noexcept(false) + { + if( pos < odbx_column_count( m_result ) ) + { +@@ -265,7 +265,7 @@ namespace OpenDBX + } + + +- Lob_Iface* Result_Impl::getLob( const char* value ) throw( std::exception ) ++ Lob_Iface* Result_Impl::getLob( const char* value ) noexcept(false) + { + return new Lob_Impl( m_result, value ); + } +@@ -280,7 +280,7 @@ namespace OpenDBX + + + +- Stmt_Impl::Stmt_Impl( odbx_t* handle ) throw( std::exception ) ++ Stmt_Impl::Stmt_Impl( odbx_t* handle ) noexcept(false) + { + m_handle = handle; + } +@@ -301,7 +301,7 @@ namespace OpenDBX + + + +- StmtSimple_Impl::StmtSimple_Impl( odbx_t* handle, const string& sql ) throw( std::exception ) : Stmt_Impl( handle ) ++ StmtSimple_Impl::StmtSimple_Impl( odbx_t* handle, const string& sql ) noexcept(false) : Stmt_Impl( handle ) + { + m_sql = sql; + /* m_buffer = NULL; +@@ -326,7 +326,7 @@ namespace OpenDBX + + + +- StmtSimple_Impl::StmtSimple_Impl() throw( std::exception ) : Stmt_Impl( NULL ) ++ StmtSimple_Impl::StmtSimple_Impl() noexcept(false) : Stmt_Impl( NULL ) + { + // m_buffer = NULL; + // m_bufsize = 0; +@@ -365,7 +365,7 @@ namespace OpenDBX + + + +- Result_Iface* StmtSimple_Impl::execute() throw( std::exception ) ++ Result_Iface* StmtSimple_Impl::execute() noexcept(false) + { + // if( m_binds.size() ) { _exec_params(); } + // else { _exec_noparams(); } +@@ -377,7 +377,7 @@ namespace OpenDBX + + + +- inline void StmtSimple_Impl::_exec_noparams() throw( std::exception ) ++ inline void StmtSimple_Impl::_exec_noparams() noexcept(false) + { + int err; + +@@ -452,7 +452,7 @@ namespace OpenDBX + + + +- Conn_Impl::Conn_Impl( const char* backend, const char* host, const char* port ) throw( std::exception ) ++ Conn_Impl::Conn_Impl( const char* backend, const char* host, const char* port ) noexcept(false) + { + int err; + +@@ -480,7 +480,7 @@ namespace OpenDBX + + + +- void Conn_Impl::bind( const char* database, const char* who, const char* cred, odbxbind method ) throw( std::exception ) ++ void Conn_Impl::bind( const char* database, const char* who, const char* cred, odbxbind method ) noexcept(false) + { + int err; + +@@ -494,7 +494,7 @@ namespace OpenDBX + + + +- void Conn_Impl::unbind() throw( std::exception ) ++ void Conn_Impl::unbind() noexcept(false) + { + int err; + +@@ -508,7 +508,7 @@ namespace OpenDBX + + + +- void Conn_Impl::finish() throw( std::exception ) ++ void Conn_Impl::finish() noexcept(false) + { + int err; + +@@ -528,7 +528,7 @@ namespace OpenDBX + + + +- bool Conn_Impl::getCapability( odbxcap cap ) throw( std::exception ) ++ bool Conn_Impl::getCapability( odbxcap cap ) noexcept(false) + { + int err = odbx_capabilities( m_handle, (unsigned int) cap ); + +@@ -545,7 +545,7 @@ namespace OpenDBX + + + +- void Conn_Impl::getOption( odbxopt option, void* value ) throw( std::exception ) ++ void Conn_Impl::getOption( odbxopt option, void* value ) noexcept(false) + { + int err; + +@@ -557,7 +557,7 @@ namespace OpenDBX + + + +- void Conn_Impl::setOption( odbxopt option, void* value ) throw( std::exception ) ++ void Conn_Impl::setOption( odbxopt option, void* value ) noexcept(false) + { + int err; + +@@ -569,7 +569,7 @@ namespace OpenDBX + + + +- string& Conn_Impl::escape( const char* from, unsigned long fromlen, string& to ) throw( std::exception ) ++ string& Conn_Impl::escape( const char* from, unsigned long fromlen, string& to ) noexcept(false) + { + int err; + unsigned long size = m_escsize; +@@ -594,7 +594,7 @@ namespace OpenDBX + + + +- Stmt_Iface* Conn_Impl::create( const string& sql, Stmt::Type type ) throw( std::exception ) ++ Stmt_Iface* Conn_Impl::create( const string& sql, Stmt::Type type ) noexcept(false) + { + switch( type ) + { +@@ -607,7 +607,7 @@ namespace OpenDBX + + + +- inline char* Conn_Impl::_resize( char* buffer, size_t size ) throw( std::exception ) ++ inline char* Conn_Impl::_resize( char* buffer, size_t size ) noexcept(false) + { + if( ( buffer = (char*) std::realloc( buffer, size ) ) == NULL ) + { diff --git a/databases/opendbx/files/patch-lib_odbx__impl.hpp b/databases/opendbx/files/patch-lib_odbx__impl.hpp new file mode 100644 index 000000000000..5e6c0d94f9e7 --- /dev/null +++ b/databases/opendbx/files/patch-lib_odbx__impl.hpp @@ -0,0 +1,128 @@ +--- lib/odbx_impl.hpp.orig 2010-08-01 02:08:41 UTC ++++ lib/odbx_impl.hpp +@@ -37,13 +37,13 @@ namespace OpenDBX + + public: + +- Lob_Impl( odbx_result_t* result, const char* value ) throw( std::exception ); ++ Lob_Impl( odbx_result_t* result, const char* value ) noexcept(false); + ~Lob_Impl() throw(); + +- void close() throw( std::exception ); ++ void close() noexcept(false); + +- ssize_t read( void* buffer, size_t buflen ) throw( std::exception ); +- ssize_t write( void* buffer, size_t buflen ) throw( std::exception ); ++ ssize_t read( void* buffer, size_t buflen ) noexcept(false); ++ ssize_t write( void* buffer, size_t buflen ) noexcept(false); + }; + + +@@ -56,25 +56,25 @@ namespace OpenDBX + + public: + +- Result_Impl( odbx_t* handle ) throw( std::exception ); ++ Result_Impl( odbx_t* handle ) noexcept(false); + ~Result_Impl() throw(); + +- void finish() throw( std::exception ); ++ void finish() noexcept(false); + +- odbxres getResult( struct timeval* timeout, unsigned long chunk ) throw( std::exception ); ++ odbxres getResult( struct timeval* timeout, unsigned long chunk ) noexcept(false); + +- odbxrow getRow() throw( std::exception ); +- uint64_t rowsAffected() throw( std::exception ); ++ odbxrow getRow() noexcept(false); ++ uint64_t rowsAffected() noexcept(false); + +- unsigned long columnCount() throw( std::exception ); +- unsigned long columnPos( const string& name ) throw( std::exception ); +- const string columnName( unsigned long pos ) throw( std::exception ); +- odbxtype columnType( unsigned long pos ) throw( std::exception ); ++ unsigned long columnCount() noexcept(false); ++ unsigned long columnPos( const string& name ) noexcept(false); ++ const string columnName( unsigned long pos ) noexcept(false); ++ odbxtype columnType( unsigned long pos ) noexcept(false); + +- unsigned long fieldLength( unsigned long pos ) throw( std::exception ); +- const char* fieldValue( unsigned long pos ) throw( std::exception ); ++ unsigned long fieldLength( unsigned long pos ) noexcept(false); ++ const char* fieldValue( unsigned long pos ) noexcept(false); + +- Lob_Iface* getLob( const char* value ) throw( std::exception ); ++ Lob_Iface* getLob( const char* value ) noexcept(false); + }; + + +@@ -89,7 +89,7 @@ namespace OpenDBX + + public: + +- Stmt_Impl( odbx_t* handle ) throw( std::exception ); ++ Stmt_Impl( odbx_t* handle ) noexcept(false); + }; + + +@@ -106,19 +106,19 @@ namespace OpenDBX + + protected: + +-// inline void _exec_params() throw( std::exception ); +- inline void _exec_noparams() throw( std::exception ); ++// inline void _exec_params() noexcept(false); ++ inline void _exec_noparams() noexcept(false); + + public: + +- StmtSimple_Impl( odbx_t* handle, const string& sql ) throw( std::exception ); +- StmtSimple_Impl() throw( std::exception ); ++ StmtSimple_Impl( odbx_t* handle, const string& sql ) noexcept(false); ++ StmtSimple_Impl() noexcept(false); + ~StmtSimple_Impl() throw(); + + // void bind( const void* data, unsigned long size, size_t pos, int flags ); + // size_t count(); + +- Result_Iface* execute() throw( std::exception ); ++ Result_Iface* execute() noexcept(false); + }; + + +@@ -132,25 +132,25 @@ namespace OpenDBX + + protected: + +- inline char* _resize( char* buffer, size_t size ) throw( std::exception ); ++ inline char* _resize( char* buffer, size_t size ) noexcept(false); + + public: + +- Conn_Impl( const char* backend, const char* host, const char* port ) throw( std::exception ); ++ Conn_Impl( const char* backend, const char* host, const char* port ) noexcept(false); + ~Conn_Impl() throw(); +- void finish() throw( std::exception ); ++ void finish() noexcept(false); + +- void bind( const char* database, const char* who, const char* cred, odbxbind method = ODBX_BIND_SIMPLE ) throw( std::exception ); +- void unbind() throw( std::exception ); ++ void bind( const char* database, const char* who, const char* cred, odbxbind method = ODBX_BIND_SIMPLE ) noexcept(false); ++ void unbind() noexcept(false); + +- bool getCapability( odbxcap cap ) throw( std::exception ); ++ bool getCapability( odbxcap cap ) noexcept(false); + +- void getOption( odbxopt option, void* value ) throw( std::exception ); +- void setOption( odbxopt option, void* value ) throw( std::exception ); ++ void getOption( odbxopt option, void* value ) noexcept(false); ++ void setOption( odbxopt option, void* value ) noexcept(false); + +- string& escape( const char* from, unsigned long fromlen, string& to ) throw( std::exception ); ++ string& escape( const char* from, unsigned long fromlen, string& to ) noexcept(false); + +- Stmt_Iface* create( const string& sql, Stmt::Type type ) throw( std::exception ); ++ Stmt_Iface* create( const string& sql, Stmt::Type type ) noexcept(false); + }; + + } // namespace diff --git a/databases/opendbx/files/patch-lib_opendbx_api b/databases/opendbx/files/patch-lib_opendbx_api new file mode 100644 index 000000000000..1194fc6bdb90 --- /dev/null +++ b/databases/opendbx/files/patch-lib_opendbx_api @@ -0,0 +1,281 @@ +--- lib/opendbx/api.orig 2010-08-01 02:08:41 UTC ++++ lib/opendbx/api +@@ -265,7 +265,7 @@ namespace OpenDBX + * @return Lob instance + * @throws std::exception If an error occures + */ +- Lob( Lob_Iface* impl ) throw( std::exception ); ++ Lob( Lob_Iface* impl ) noexcept(false); + + public: + +@@ -319,7 +319,7 @@ namespace OpenDBX + * + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- void close() throw( std::exception ); ++ void close() noexcept(false); + + /** + * Reads content from large object into the buffer. +@@ -344,7 +344,7 @@ namespace OpenDBX + * @return Number of bytes written into the buffer + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- ssize_t read( void* buffer, size_t buflen ) throw( std::exception ); ++ ssize_t read( void* buffer, size_t buflen ) noexcept(false); + + /** + * Writes data from the buffer into the large object. +@@ -368,7 +368,7 @@ namespace OpenDBX + * @return Number of bytes written into the large object + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- ssize_t write( void* buffer, size_t buflen ) throw( std::exception ); ++ ssize_t write( void* buffer, size_t buflen ) noexcept(false); + }; + + +@@ -417,7 +417,7 @@ namespace OpenDBX + * @throws std::exception If an error occures + * @return Result instance + */ +- Result( Result_Iface* impl ) throw( std::exception ); ++ Result( Result_Iface* impl ) noexcept(false); + + public: + +@@ -470,7 +470,7 @@ namespace OpenDBX + * + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- void finish() throw( std::exception ); ++ void finish() noexcept(false); + + /** + * Fetches one result set from the database server. +@@ -511,7 +511,7 @@ namespace OpenDBX + * @throws OpenDBX::Exception If the underlying database library returns an error + * @see odbxres + */ +- odbxres getResult( struct timeval* timeout = NULL, unsigned long chunk = 0 ) throw( std::exception ); ++ odbxres getResult( struct timeval* timeout = NULL, unsigned long chunk = 0 ) noexcept(false); + + /** + * Makes data of next row available. +@@ -529,7 +529,7 @@ namespace OpenDBX + * @return Status of the attempt to fetch one more row + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- odbxrow getRow() throw( std::exception ); ++ odbxrow getRow() noexcept(false); + + /** + * Returns the number of rows affected by DELETE, INSERT of UPDATE statements. +@@ -545,7 +545,7 @@ namespace OpenDBX + * @return Number of rows touched + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- uint64_t rowsAffected() throw( std::exception ); ++ uint64_t rowsAffected() noexcept(false); + + /** + * Returns the number of columns available in this result set. +@@ -559,7 +559,7 @@ namespace OpenDBX + * @return Number of columns + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- unsigned long columnCount() throw( std::exception ); ++ unsigned long columnCount() noexcept(false); + + /** + * Maps the column name to the column number required by other methods. +@@ -572,7 +572,7 @@ namespace OpenDBX + * @return Position of column in result set + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- unsigned long columnPos( const string& name ) throw( std::exception ); ++ unsigned long columnPos( const string& name ) noexcept(false); + + /** + * Returns the name of the column in the current result set. +@@ -586,7 +586,7 @@ namespace OpenDBX + * @return Column name + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- const string columnName( unsigned long pos ) throw( std::exception ); ++ const string columnName( unsigned long pos ) noexcept(false); + + /** + * Returns the type of the column in the current result set. +@@ -643,7 +643,7 @@ namespace OpenDBX + * @throws OpenDBX::Exception If the underlying database library returns an error + * @see odbxtype + */ +- odbxtype columnType( unsigned long pos ) throw( std::exception ); ++ odbxtype columnType( unsigned long pos ) noexcept(false); + + /** + * Returns the size of the content in the current row at the specified postion. +@@ -656,7 +656,7 @@ namespace OpenDBX + * @return Size of the data in bytes + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- unsigned long fieldLength( unsigned long pos ) throw( std::exception ); ++ unsigned long fieldLength( unsigned long pos ) noexcept(false); + + /** + * Returns a pointer to the content in the current row at the specified postion. +@@ -675,7 +675,7 @@ namespace OpenDBX + * @return Pointer to the data + * @throws OpenDBX::Exception If the underlying database library returns an error + */ +- const char* fieldValue( unsigned long pos ) throw( std::exception ); ++ const char* fieldValue( unsigned long pos ) noexcept(false); + + /** + * Creates a large object instance if supported by the database. +@@ -696,7 +696,7 @@ namespace OpenDBX + * @throws OpenDBX::Exception If the underlying database library returns an error + * @see Lob + */ +- Lob getLob( const char* value ) throw( std::exception ); ++ Lob getLob( const char* value ) noexcept(false); + }; + + +@@ -745,7 +745,7 @@ namespace OpenDBX + * @throws std::exception If an error occures + * @return Statement instance + */ +- Stmt( Stmt_Iface* impl ) throw( std::exception ); ++ Stmt( Stmt_Iface* impl ) noexcept(false); + + public: + +@@ -808,7 +808,7 @@ namespace OpenDBX + * @throws OpenDBX::Exception If the underlying database library returns an error + * @see Result + */ +- Result execute() throw( std::exception ); ++ Result execute() noexcept(false); + }; + + +@@ -894,7 +894,7 @@ namespace OpenDBX + * @throws OpenDBX::Exception If the underlying database library returns an error + * @see #Conn( const string&, const string&, const string& ) + */ +- Conn( const char* backend, const char* host = "", const char* port = "" ) throw( std::exception ); ++ Conn( const char* backend, const char* host = "", const char* port = "" ) noexcept(false); *** 111 LINES SKIPPED ***