--- parser3/src/classes/hash.C	2009/07/07 06:27:05	1.100
+++ parser3/src/classes/hash.C	2009/07/29 05:01:33	1.102
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2009/07/07 06:27:05 $";
+static const char * const IDENT_HASH_C="$Date: 2009/07/29 05:01:33 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -34,10 +34,6 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(hash, new MHash, 0);
 
-// externs
-
-extern String cycle_data_name;
-
 // methods
 
 #ifndef DOXYGEN
@@ -390,7 +386,7 @@ static void _keys(Request& r, MethodPara
 	else 
 		keys_column_name=new String("key");
 
-	Table::columns_type columns(new ArrayString);
+	Table::columns_type columns(new ArrayString(1));
 	*columns+=keys_column_name;
 	Table* table=new Table(columns);
 
@@ -457,8 +453,7 @@ static bool one_foreach_cycle(
 	}
 }
 static void _foreach(Request& r, MethodParams& params) {
-	Temp_hash_value<const String::Body, void*> 
-		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+	InCycle temp(r);
 
 	const String& key_var_name=params.as_string(0, "key-var name must be string");
 	const String& value_var_name=params.as_string(1, "value-var name must be string");