--- parser3/src/classes/hash.C 2017/05/17 14:22:11 1.142 +++ parser3/src/classes/hash.C 2019/09/06 10:17:07 1.144 @@ -17,7 +17,7 @@ #include "pa_vbool.h" #include "pa_vmethod_frame.h" -volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.142 2017/05/17 14:22:11 moko Exp $"; +volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.144 2019/09/06 10:17:07 moko Exp $"; // class @@ -284,12 +284,6 @@ static void _intersects(Request& r, Meth } -extern String sql_bind_name; -extern String sql_limit_name; -extern String sql_offset_name; -extern String sql_default_name; -extern String sql_distinct_name; -extern String sql_value_type_name; extern Table2hash_value_type get_value_type(Value& vvalue_type); extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders); extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders); @@ -467,7 +461,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 +499,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;