--- parser3/src/classes/hashfile.C	2008/05/19 08:56:59	1.44
+++ parser3/src/classes/hashfile.C	2009/06/14 00:33:36	1.47
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b hashfile parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT="$Id: hashfile.C,v 1.44 2008/05/19 08:56:59 misha Exp $";
+static const char * const IDENT="$Id: hashfile.C,v 1.47 2009/06/14 00:33:36 misha Exp $";
 
 #include "classes.h"
 
@@ -18,7 +18,7 @@ static const char * const IDENT="$Id: ha
 
 class MHashfile : public Methoded {
 public: // VStateless_class
-	Value *create_new_value(Pool& apool, HashStringValue&) { return new VHashfile(apool); }
+	Value *create_new_value(Pool& apool, HashStringValue*) { return new VHashfile(apool); }
 
 public:
 	MHashfile();
@@ -40,7 +40,7 @@ extern String cycle_data_name;
 
 // methods
 
-typedef Hash<const String::Body, bool> HashStringBool;
+typedef HashString<bool> HashStringBool;
 
 static void _open(Request& r, MethodParams& params) {
 	HashStringBool* file_list=static_cast<HashStringBool*>(r.classes_conf.get(OPEN_DATA_NAME));
@@ -119,7 +119,7 @@ static bool one_foreach_cycle(
 	Request::Skip lskip=info.r->get_skip(); info.r->set_skip(Request::SKIP_NOTHING);
 
 	const String* s_processed=sv_processed.get_string();
-	if(info.delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
+	if(info.delim_maybe_code && s_processed && !s_processed->is_empty()) { // delimiter set and we have body
 		if(info.need_delim) // need delim & iteration produced string?
 			info.r->write_pass_lang(info.r->process(*info.delim_maybe_code));
 		else