From 672dbc2ef49d109f266bfc401c6c18071a3e0824 Mon Sep 17 00:00:00 2001 From: stefanocasazza Date: Fri, 31 Jul 2015 18:32:33 +0200 Subject: [PATCH] little optimizations --- include/ulib/net/server/client_image.h | 6 ++--- include/ulib/net/server/client_image_rdb.h | 4 ++-- include/ulib/net/server/plugin/mod_echo.h | 2 +- include/ulib/net/server/plugin/mod_fcgi.h | 6 ++--- include/ulib/net/server/plugin/mod_geoip.h | 8 +++---- include/ulib/net/server/plugin/mod_http.h | 20 ++++++++-------- include/ulib/net/server/plugin/mod_nocat.h | 14 +++++------ include/ulib/net/server/plugin/mod_proxy.h | 6 ++--- include/ulib/net/server/plugin/mod_rpc.h | 8 +++---- include/ulib/net/server/plugin/mod_scgi.h | 6 ++--- include/ulib/net/server/plugin/mod_skeleton.h | 16 ++++++------- include/ulib/net/server/plugin/mod_soap.h | 6 ++--- include/ulib/net/server/plugin/mod_socket.h | 6 ++--- include/ulib/net/server/plugin/mod_ssi.h | 6 ++--- include/ulib/net/server/plugin/mod_stream.h | 8 +++---- include/ulib/net/server/plugin/mod_tsa.h | 6 ++--- include/ulib/net/server/server.h | 14 +++++------ include/ulib/net/server/server_rdb.h | 8 +++---- include/ulib/net/unixsocket.h | 1 + include/ulib/orm/driver/orm_driver_mysql.h | 24 +++++++++---------- include/ulib/orm/driver/orm_driver_pgsql.h | 24 +++++++++---------- include/ulib/orm/driver/orm_driver_sqlite.h | 24 +++++++++---------- 22 files changed, 112 insertions(+), 111 deletions(-) diff --git a/include/ulib/net/server/client_image.h b/include/ulib/net/server/client_image.h index 80d9a5ea..225723b0 100644 --- a/include/ulib/net/server/client_image.h +++ b/include/ulib/net/server/client_image.h @@ -72,9 +72,9 @@ public: // define method VIRTUAL of class UEventFd virtual int handlerRead() U_DECL_OVERRIDE; - virtual int handlerWrite() U_DECL_OVERRIDE; - virtual int handlerTimeout() U_DECL_OVERRIDE; - virtual void handlerDelete() U_DECL_OVERRIDE; + virtual int handlerWrite() U_DECL_FINAL; + virtual int handlerTimeout() U_DECL_FINAL; + virtual void handlerDelete() U_DECL_FINAL; static void setNoHeaderForResponse() { diff --git a/include/ulib/net/server/client_image_rdb.h b/include/ulib/net/server/client_image_rdb.h index 0827f3f2..efc074b0 100644 --- a/include/ulib/net/server/client_image_rdb.h +++ b/include/ulib/net/server/client_image_rdb.h @@ -25,7 +25,7 @@ class URDB; -class U_EXPORT URDBClientImage U_DECL_FINAL : public UClientImage { +class U_EXPORT URDBClientImage : public UClientImage { public: URDBClientImage() : UClientImage() @@ -49,7 +49,7 @@ protected: // define method VIRTUAL of class UEventFd - virtual int handlerRead() U_DECL_OVERRIDE; + virtual int handlerRead() U_DECL_FINAL; private: #ifdef U_COMPILER_DELETE_MEMBERS diff --git a/include/ulib/net/server/plugin/mod_echo.h b/include/ulib/net/server/plugin/mod_echo.h index 882f1c27..9c748bc0 100644 --- a/include/ulib/net/server/plugin/mod_echo.h +++ b/include/ulib/net/server/plugin/mod_echo.h @@ -30,7 +30,7 @@ public: // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; private: #ifdef U_COMPILER_DELETE_MEMBERS diff --git a/include/ulib/net/server/plugin/mod_fcgi.h b/include/ulib/net/server/plugin/mod_fcgi.h index dd0895b6..ddb5db68 100644 --- a/include/ulib/net/server/plugin/mod_fcgi.h +++ b/include/ulib/net/server/plugin/mod_fcgi.h @@ -34,12 +34,12 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_geoip.h b/include/ulib/net/server/plugin/mod_geoip.h index 6b23b96a..dadcc67d 100644 --- a/include/ulib/net/server/plugin/mod_geoip.h +++ b/include/ulib/net/server/plugin/mod_geoip.h @@ -35,13 +35,13 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerREAD() U_DECL_OVERRIDE; - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerREAD() U_DECL_FINAL; + virtual int handlerRequest() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_http.h b/include/ulib/net/server/plugin/mod_http.h index 7e894349..28dac652 100644 --- a/include/ulib/net/server/plugin/mod_http.h +++ b/include/ulib/net/server/plugin/mod_http.h @@ -36,25 +36,25 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; - virtual int handlerRun() U_DECL_OVERRIDE; - virtual int handlerFork() U_DECL_OVERRIDE; - virtual int handlerStop() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; + virtual int handlerRun() U_DECL_FINAL; + virtual int handlerFork() U_DECL_FINAL; + virtual int handlerStop() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerREAD() U_DECL_OVERRIDE; - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerREAD() U_DECL_FINAL; + virtual int handlerRequest() U_DECL_FINAL; // SigHUP hook - virtual int handlerSigHUP() U_DECL_OVERRIDE; + virtual int handlerSigHUP() U_DECL_FINAL; // define method VIRTUAL of class UEventFd - virtual int handlerRead() U_DECL_OVERRIDE; - virtual void handlerDelete() U_DECL_OVERRIDE; + virtual int handlerRead() U_DECL_FINAL; + virtual void handlerDelete() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_nocat.h b/include/ulib/net/server/plugin/mod_nocat.h index f1c27311..19103aae 100644 --- a/include/ulib/net/server/plugin/mod_nocat.h +++ b/include/ulib/net/server/plugin/mod_nocat.h @@ -71,7 +71,7 @@ public: // define method VIRTUAL of class UEventTime - virtual int handlerTime() U_DECL_OVERRIDE; + virtual int handlerTime() U_DECL_FINAL; // DEBUG @@ -140,18 +140,18 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; - virtual int handlerFork() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; + virtual int handlerFork() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; - virtual int handlerReset() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; + virtual int handlerReset() U_DECL_FINAL; // define method VIRTUAL of class UEventTime - virtual int handlerTime() U_DECL_OVERRIDE; + virtual int handlerTime() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_proxy.h b/include/ulib/net/server/plugin/mod_proxy.h index 83f48272..1e903fda 100644 --- a/include/ulib/net/server/plugin/mod_proxy.h +++ b/include/ulib/net/server/plugin/mod_proxy.h @@ -33,12 +33,12 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_rpc.h b/include/ulib/net/server/plugin/mod_rpc.h index a7f19975..45047129 100644 --- a/include/ulib/net/server/plugin/mod_rpc.h +++ b/include/ulib/net/server/plugin/mod_rpc.h @@ -37,13 +37,13 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE __pure; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL __pure; // Connection-wide hooks - virtual int handlerREAD() U_DECL_OVERRIDE; - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerREAD() U_DECL_FINAL; + virtual int handlerRequest() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_scgi.h b/include/ulib/net/server/plugin/mod_scgi.h index 25011f7f..e2f8e2f1 100644 --- a/include/ulib/net/server/plugin/mod_scgi.h +++ b/include/ulib/net/server/plugin/mod_scgi.h @@ -34,12 +34,12 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_skeleton.h b/include/ulib/net/server/plugin/mod_skeleton.h index 661dbe1d..5f56ad31 100644 --- a/include/ulib/net/server/plugin/mod_skeleton.h +++ b/include/ulib/net/server/plugin/mod_skeleton.h @@ -58,16 +58,16 @@ public: // define method VIRTUAL of class UServerPlugIn // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; - virtual int handlerRun() U_DECL_OVERRIDE; - virtual int handlerFork() U_DECL_OVERRIDE; - virtual int handlerStop() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; + virtual int handlerRun() U_DECL_FINAL; + virtual int handlerFork() U_DECL_FINAL; + virtual int handlerStop() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerREAD() U_DECL_OVERRIDE; - virtual int handlerRequest() U_DECL_OVERRIDE; - virtual int handlerReset() U_DECL_OVERRIDE; + virtual int handlerREAD() U_DECL_FINAL; + virtual int handlerRequest() U_DECL_FINAL; + virtual int handlerReset() U_DECL_FINAL; private: #ifdef U_COMPILER_DELETE_MEMBERS diff --git a/include/ulib/net/server/plugin/mod_soap.h b/include/ulib/net/server/plugin/mod_soap.h index fd84e5a6..6d4de6dd 100644 --- a/include/ulib/net/server/plugin/mod_soap.h +++ b/include/ulib/net/server/plugin/mod_soap.h @@ -33,12 +33,12 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_socket.h b/include/ulib/net/server/plugin/mod_socket.h index 890e5e86..143ade4b 100644 --- a/include/ulib/net/server/plugin/mod_socket.h +++ b/include/ulib/net/server/plugin/mod_socket.h @@ -33,12 +33,12 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerRun() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerRun() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_ssi.h b/include/ulib/net/server/plugin/mod_ssi.h index 6dec61d6..8993145f 100644 --- a/include/ulib/net/server/plugin/mod_ssi.h +++ b/include/ulib/net/server/plugin/mod_ssi.h @@ -36,12 +36,12 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; // SERVICES diff --git a/include/ulib/net/server/plugin/mod_stream.h b/include/ulib/net/server/plugin/mod_stream.h index edc1fb02..7cf476be 100644 --- a/include/ulib/net/server/plugin/mod_stream.h +++ b/include/ulib/net/server/plugin/mod_stream.h @@ -34,13 +34,13 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; - virtual int handlerRun() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; + virtual int handlerRun() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/plugin/mod_tsa.h b/include/ulib/net/server/plugin/mod_tsa.h index deed2c4b..5fdf0644 100644 --- a/include/ulib/net/server/plugin/mod_tsa.h +++ b/include/ulib/net/server/plugin/mod_tsa.h @@ -33,12 +33,12 @@ public: // Server-wide hooks - virtual int handlerConfig(UFileConfig& cfg) U_DECL_OVERRIDE; - virtual int handlerInit() U_DECL_OVERRIDE; + virtual int handlerConfig(UFileConfig& cfg) U_DECL_FINAL; + virtual int handlerInit() U_DECL_FINAL; // Connection-wide hooks - virtual int handlerRequest() U_DECL_OVERRIDE; + virtual int handlerRequest() U_DECL_FINAL; // DEBUG diff --git a/include/ulib/net/server/server.h b/include/ulib/net/server/server.h index 9bdd388b..8fbd1296 100644 --- a/include/ulib/net/server/server.h +++ b/include/ulib/net/server/server.h @@ -53,13 +53,13 @@ public: \ ~server_class() { U_TRACE_UNREGISTER_OBJECT(5, server_class) } \ const char* dump(bool reset) const { return UServer::dump(reset); } \ protected: \ -virtual void preallocate() U_DECL_OVERRIDE { \ +virtual void preallocate() U_DECL_FINAL { \ U_TRACE(5+256, #server_class "::preallocate()") \ vClientImage = new client_type[UNotifier::max_connection]; } \ -virtual void deallocate() U_DECL_OVERRIDE { \ +virtual void deallocate() U_DECL_FINAL { \ U_TRACE(5+256, #server_class "::deallocate()") \ delete[] (client_type*)vClientImage; } \ -virtual bool check_memory() U_DECL_OVERRIDE { return u_check_memory_vector((client_type*)vClientImage, UNotifier::max_connection); } } +virtual bool check_memory() U_DECL_FINAL { return u_check_memory_vector((client_type*)vClientImage, UNotifier::max_connection); } } #else # define U_MACROSERVER(server_class,client_type,socket_type) \ class server_class : public UServer { \ @@ -67,7 +67,7 @@ public: \ server_class(UFileConfig* pcfg) : UServer(pcfg) {} \ ~server_class() {} \ protected: \ -virtual void preallocate() U_DECL_OVERRIDE { \ +virtual void preallocate() U_DECL_FINAL { \ vClientImage = new client_type[UNotifier::max_connection]; } } #endif // --------------------------------------------------------------------------------------------- @@ -581,7 +581,7 @@ protected: // define method VIRTUAL of class UEventTime - virtual int handlerTime() U_DECL_OVERRIDE; + virtual int handlerTime() U_DECL_FINAL; #if defined(DEBUG) && defined(U_STDCPP_ENABLE) const char* dump(bool _reset) const { return UEventTime::dump(_reset); } @@ -600,8 +600,8 @@ protected: // define method VIRTUAL of class UEventFd - virtual int handlerRead() U_DECL_OVERRIDE; // This method is called to accept a new connection on the server socket - virtual void handlerDelete() U_DECL_OVERRIDE + virtual int handlerRead() U_DECL_FINAL; // This method is called to accept a new connection on the server socket + virtual void handlerDelete() U_DECL_FINAL { U_TRACE(0, "UServer_Base::handlerDelete()") diff --git a/include/ulib/net/server/server_rdb.h b/include/ulib/net/server/server_rdb.h index 41c5d23b..0357cc17 100644 --- a/include/ulib/net/server/server_rdb.h +++ b/include/ulib/net/server/server_rdb.h @@ -20,7 +20,7 @@ /** * @class URDBServer * - * @brief Handles incoming TCP/IP connections from URDBClient. + * @brief Handles incoming TCP/IP connections from URDBClient */ class URDB; @@ -46,10 +46,10 @@ protected: // method VIRTUAL to redefine - virtual void preallocate() U_DECL_OVERRIDE; + virtual void preallocate() U_DECL_FINAL; #ifdef DEBUG - virtual void deallocate() U_DECL_OVERRIDE; - virtual bool check_memory() U_DECL_OVERRIDE; + virtual void deallocate() U_DECL_FINAL; + virtual bool check_memory() U_DECL_FINAL; #endif private: diff --git a/include/ulib/net/unixsocket.h b/include/ulib/net/unixsocket.h index 70613f20..cd877409 100644 --- a/include/ulib/net/unixsocket.h +++ b/include/ulib/net/unixsocket.h @@ -23,6 +23,7 @@ #endif /** + * -------------------------------------------------------------------------------------------------------------------------------------------------- * Unix domain sockets are used for stream based connected sessions between processes on the same machine * -------------------------------------------------------------------------------------------------------------------------------------------------- * - UNIX domain sockets use the file system as the address name space. This means you can use UNIX file permissions to control access to communicate diff --git a/include/ulib/orm/driver/orm_driver_mysql.h b/include/ulib/orm/driver/orm_driver_mysql.h index b5b508a6..0c355e1b 100644 --- a/include/ulib/orm/driver/orm_driver_mysql.h +++ b/include/ulib/orm/driver/orm_driver_mysql.h @@ -366,20 +366,20 @@ public: // define method VIRTUAL of class UOrmDriver - virtual void handlerError() U_DECL_OVERRIDE; - virtual void handlerDisConnect() U_DECL_OVERRIDE; - virtual void execute(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual bool nextRow(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual void handlerStatementReset(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual void handlerStatementRemove(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual bool handlerQuery(const char* query, uint32_t query_len) U_DECL_OVERRIDE; + virtual void handlerError() U_DECL_FINAL; + virtual void handlerDisConnect() U_DECL_FINAL; + virtual void execute(USqlStatement* pstmt) U_DECL_FINAL; + virtual bool nextRow(USqlStatement* pstmt) U_DECL_FINAL; + virtual void handlerStatementReset(USqlStatement* pstmt) U_DECL_FINAL; + virtual void handlerStatementRemove(USqlStatement* pstmt) U_DECL_FINAL; + virtual bool handlerQuery(const char* query, uint32_t query_len) U_DECL_FINAL; - virtual unsigned int cols(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual unsigned long long affected(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual unsigned long long last_insert_rowid(USqlStatement* pstmt, const char* sequence) U_DECL_OVERRIDE; + virtual unsigned int cols(USqlStatement* pstmt) U_DECL_FINAL; + virtual unsigned long long affected(USqlStatement* pstmt) U_DECL_FINAL; + virtual unsigned long long last_insert_rowid(USqlStatement* pstmt, const char* sequence) U_DECL_FINAL; - virtual UOrmDriver* handlerConnect(const UString& option) U_DECL_OVERRIDE; - virtual USqlStatement* handlerStatementCreation(const char* stmt, uint32_t len) U_DECL_OVERRIDE; + virtual UOrmDriver* handlerConnect(const UString& option) U_DECL_FINAL; + virtual USqlStatement* handlerStatementCreation(const char* stmt, uint32_t len) U_DECL_FINAL; // CREATE BIND PARAM diff --git a/include/ulib/orm/driver/orm_driver_pgsql.h b/include/ulib/orm/driver/orm_driver_pgsql.h index 320b7d97..5cb27e06 100644 --- a/include/ulib/orm/driver/orm_driver_pgsql.h +++ b/include/ulib/orm/driver/orm_driver_pgsql.h @@ -415,20 +415,20 @@ public: // define method VIRTUAL of class UOrmDriver - virtual void handlerError() U_DECL_OVERRIDE; - virtual void handlerDisConnect() U_DECL_OVERRIDE; - virtual void execute(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual bool nextRow(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual void handlerStatementReset(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual void handlerStatementRemove(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual bool handlerQuery(const char* query, uint32_t query_len) U_DECL_OVERRIDE; + virtual void handlerError() U_DECL_FINAL; + virtual void handlerDisConnect() U_DECL_FINAL; + virtual void execute(USqlStatement* pstmt) U_DECL_FINAL; + virtual bool nextRow(USqlStatement* pstmt) U_DECL_FINAL; + virtual void handlerStatementReset(USqlStatement* pstmt) U_DECL_FINAL; + virtual void handlerStatementRemove(USqlStatement* pstmt) U_DECL_FINAL; + virtual bool handlerQuery(const char* query, uint32_t query_len) U_DECL_FINAL; - virtual unsigned int cols(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual unsigned long long affected(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual unsigned long long last_insert_rowid(USqlStatement* pstmt, const char* sequence) U_DECL_OVERRIDE; + virtual unsigned int cols(USqlStatement* pstmt) U_DECL_FINAL; + virtual unsigned long long affected(USqlStatement* pstmt) U_DECL_FINAL; + virtual unsigned long long last_insert_rowid(USqlStatement* pstmt, const char* sequence) U_DECL_FINAL; - virtual UOrmDriver* handlerConnect(const UString& option) U_DECL_OVERRIDE; - virtual USqlStatement* handlerStatementCreation(const char* stmt, uint32_t len) U_DECL_OVERRIDE + virtual UOrmDriver* handlerConnect(const UString& option) U_DECL_FINAL; + virtual USqlStatement* handlerStatementCreation(const char* stmt, uint32_t len) U_DECL_FINAL { U_TRACE(0, "UOrmDriverPgSql::handlerStatementCreation(%.*S,%u)", len, stmt, len) diff --git a/include/ulib/orm/driver/orm_driver_sqlite.h b/include/ulib/orm/driver/orm_driver_sqlite.h index a377f075..18869bac 100644 --- a/include/ulib/orm/driver/orm_driver_sqlite.h +++ b/include/ulib/orm/driver/orm_driver_sqlite.h @@ -358,20 +358,20 @@ public: // define method VIRTUAL of class UOrmDriver - virtual void handlerError() U_DECL_OVERRIDE; - virtual void handlerDisConnect() U_DECL_OVERRIDE; - virtual void execute(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual bool nextRow(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual void handlerStatementReset(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual void handlerStatementRemove(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual bool handlerQuery(const char* query, uint32_t query_len) U_DECL_OVERRIDE; + virtual void handlerError() U_DECL_FINAL; + virtual void handlerDisConnect() U_DECL_FINAL; + virtual void execute(USqlStatement* pstmt) U_DECL_FINAL; + virtual bool nextRow(USqlStatement* pstmt) U_DECL_FINAL; + virtual void handlerStatementReset(USqlStatement* pstmt) U_DECL_FINAL; + virtual void handlerStatementRemove(USqlStatement* pstmt) U_DECL_FINAL; + virtual bool handlerQuery(const char* query, uint32_t query_len) U_DECL_FINAL; - virtual unsigned int cols(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual unsigned long long affected(USqlStatement* pstmt) U_DECL_OVERRIDE; - virtual unsigned long long last_insert_rowid(USqlStatement* pstmt, const char* sequence) U_DECL_OVERRIDE; + virtual unsigned int cols(USqlStatement* pstmt) U_DECL_FINAL; + virtual unsigned long long affected(USqlStatement* pstmt) U_DECL_FINAL; + virtual unsigned long long last_insert_rowid(USqlStatement* pstmt, const char* sequence) U_DECL_FINAL; - virtual UOrmDriver* handlerConnect(const UString& option) U_DECL_OVERRIDE; - virtual USqlStatement* handlerStatementCreation(const char* stmt, uint32_t len) U_DECL_OVERRIDE; + virtual UOrmDriver* handlerConnect(const UString& option) U_DECL_FINAL; + virtual USqlStatement* handlerStatementCreation(const char* stmt, uint32_t len) U_DECL_FINAL; // CREATE BIND PARAM