--- parser3/src/classes/hash.C 2017/02/07 22:00:27 1.141 +++ parser3/src/classes/hash.C 2017/11/15 22:48:57 1.143 @@ -17,7 +17,7 @@ #include "pa_vbool.h" #include "pa_vmethod_frame.h" -volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.141 2017/02/07 22:00:27 moko Exp $"; +volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.143 2017/11/15 22:48:57 moko Exp $"; // class @@ -74,7 +74,7 @@ public: columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */); return false; } catch(...) { - error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column"); + error=SQL_Error("exception occurred in Hash_sql_event_handlers::add_column"); return true; } } @@ -180,7 +180,7 @@ public: column_index++; return false; } catch(...) { - error=SQL_Error("exception occured in Hash_sql_event_handlers::add_row_cell"); + error=SQL_Error("exception occurred in Hash_sql_event_handlers::add_row_cell"); return true; } } @@ -467,7 +467,7 @@ inline Value& SingleElementHash(String:: } #ifndef DOXYGEN -struct Hash_seq_item { +struct Hash_seq_item : public PA_Allocated { HashStringValue::Pair *hash_pair; union { const char *c_str; @@ -505,7 +505,7 @@ static void _sort(Request& r, MethodPara HashStringValue& hash=GET_SELF(r, VHashBase).hash(); int count=hash.count(); - Hash_seq_item* seq=new(PointerFreeGC) Hash_seq_item[count]; + Hash_seq_item* seq=new Hash_seq_item[count]; int pos=0; bool key_values_are_strings=true;