--- parser3/src/main/pa_table.C	2003/04/14 11:23:41	1.53.2.10.2.7
+++ parser3/src/main/pa_table.C	2003/11/20 15:35:32	1.57
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_TABLE_C="$Date: 2003/04/14 11:23:41 $";
+static const char* IDENT_TABLE_C="$Date: 2003/11/20 15:35:32 $";
 
 #include "pa_table.h"
 
@@ -19,7 +19,6 @@ Table::Table(columns_type acolumns, size
 	name2number(new name2number_hash_class) {
 
 	if(fcolumns) {
-		size_t fcolumns_count=fcolumns->count();
 		size_t number=1;
 		for(Array_iterator<const String*> i(*fcolumns); i.has_next(); ) {
 			const String& name=*i.next();
@@ -65,17 +64,15 @@ struct Locate_int_string_info {
 	const String* value;
 };
 #endif
-bool locate_int_string(Table& self, void* ainfo) {
-	Locate_int_string_info& info=*static_cast<Locate_int_string_info*>(ainfo);
-
-	const String *item_value=self.item(info.column);
-	return item_value && *item_value==*info.value;
+bool locate_int_string(Table& self, Locate_int_string_info* info) {
+	const String *item_value=self.item(info->column);
+	return item_value && *item_value==*info->value;
 }
 
 bool Table::locate(int column, const String& value,
 		   Table::Action_options& options) {
 	Locate_int_string_info info={column, &value};
-	return locate(locate_int_string, &info, options);
+	return table_first_that(locate_int_string, &info, options);
 }
 
 bool Table::locate(const String& column, const String& value,