--- parser3/src/main/pa_sql_driver_manager.C 2004/12/23 16:47:31 1.84 +++ parser3/src/main/pa_sql_driver_manager.C 2006/04/09 13:38:47 1.86 @@ -1,11 +1,11 @@ /** @file Parser: sql driver manager implementation. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2004/12/23 16:47:31 $"; +static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2006/04/09 13:38:47 $"; #include "pa_sql_driver_manager.h" #include "ltdl.h" @@ -106,7 +106,7 @@ SQL_Driver_manager::SQL_Driver_manager() } SQL_Driver_manager::~SQL_Driver_manager() { - connection_cache.for_each(expire_connections, time(0)+(time_t)10/*=in future=expire all*/); + connection_cache.for_each(expire_connections, time(0)+(time_t)10/*=in future=expire all*/); if(is_dlinited) lt_dlexit(); @@ -187,8 +187,8 @@ SQL_Connection* SQL_Driver_manager::get_ error?error:"can not open the module"); } - SQL_Driver_create_func create=(SQL_Driver_create_func)lt_dlsym(handle, - SQL_DRIVER_CREATE_NAME); + SQL_Driver_create_func create=(SQL_Driver_create_func)(lt_dlsym(handle, + SQL_DRIVER_CREATE_NAME)); if(!create) throw Exception(0, library, @@ -286,7 +286,7 @@ void SQL_Driver_manager::maybe_expire_ca time_t now=time(0); if(prev_expiration_pass_time(expire_connections, time_t(now-EXPIRE_UNUSED_CONNECTION_SECONDS)); prev_expiration_pass_time=now; } @@ -323,7 +323,7 @@ Value* SQL_Driver_manager::get_status() columns+=new String("time"); Table& table=*new Table(&columns, connection_cache.count()); - connection_cache.for_each(add_connections_to_status_cache_table, &table); + connection_cache.for_each(add_connections_to_status_cache_table, &table); result->get_hash()->put(*new String("cache"), new VTable(&table)); }