--- parser3/src/classes/hash.C 2002/12/09 12:19:16 1.53 +++ parser3/src/classes/hash.C 2003/01/31 12:34:26 1.54.2.2 @@ -1,11 +1,11 @@ /** @file Parser: @b hash parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_HASH_C="$Date: 2002/12/09 12:19:16 $"; +static const char* IDENT_HASH_C="$Date: 2003/01/31 12:34:26 $"; #include "classes.h" #include "pa_request.h" @@ -20,7 +20,7 @@ static const char* IDENT_HASH_C="$Date: class MHash : public Methoded { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VHash(pool); } + ValuePtr create_new_value() { return ValuePtr(new VHash()); } public: MHash(Pool& pool); @@ -34,7 +34,7 @@ public: // Methoded class Hash_sql_event_handlers: public SQL_Driver_query_event_handlers { public: Hash_sql_event_handlers(Pool& apool, const String& amethod_name, - const String& astatement_string, const char *astatement_cstr, + const String& astatement_string, const char* astatement_cstr, bool adistinct, Hash& arows_hash): pool(apool), @@ -50,7 +50,7 @@ public: try { String *column=new(pool) String(pool); column->APPEND_TAINTED( - (const char *)ptr, size, + (const char* )ptr, size, statement_cstr, 0); columns+=column; @@ -79,7 +79,7 @@ public: String *cell=new(pool) String(pool); if(size) cell->APPEND_TAINTED( - (const char *)ptr, size, + (const char* )ptr, size, statement_cstr, row_index++); if(column_index==0) { VHash *row_vhash=new(pool) VHash(pool); @@ -105,7 +105,7 @@ public: private: Pool& pool; const String& method_name; - const String& statement_string; const char *statement_cstr; + const String& statement_string; const char* statement_cstr; bool distinct; Hash& rows_hash; Hash *row_hash; @@ -250,7 +250,7 @@ static void _sql(Request& r, const Strin Temp_lang temp_lang(r, String::UL_SQL); const String& statement_string=r.process_to_string(statement); - const char *statement_cstr= + const char* statement_cstr= statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Hash& hash=static_cast(r.get_self())->hash(&method_name); hash.clear();