--- parser3/src/main/pa_table.C	2003/01/30 11:00:41	1.53.2.6
+++ parser3/src/main/pa_table.C	2003/01/31 12:10:48	1.53.2.7
@@ -5,14 +5,14 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_TABLE_C="$Date: 2003/01/30 11:00:41 $";
+static const char* IDENT_TABLE_C="$Date: 2003/01/31 12:10:48 $";
 
 #include "pa_table.h"
 #include "pa_pool.h"
 #include "pa_exception.h"
 
 Table::Table(
-			 ConstStringPtr aorigin_string,
+			 StringPtr aorigin_string,
 			 columns_type acolumns,
 			 int initial_rows):
 	Array<element_type>(initial_rows),
@@ -40,7 +40,7 @@ Table::Table(const Table& src, int offse
 	append(src, offset, limit);
 }
 
-int Table::column_name2index(object_ptr<const String> column_name, bool bark) const {
+int Table::column_name2index(StringPtr column_name, bool bark) const {
 	if(fcolumns.get()) {// named
 		int result=name2number->get(*column_name.get())-1; // -1 = column not found
 		if(bark && result<0)
@@ -52,7 +52,7 @@ int Table::column_name2index(object_ptr<
 		return column_name->as_int();
 }
 
-ConstStringPtr Table::item(int column) {
+StringPtr Table::item(int column) {
 	if(valid(fcurrent)) {
 		element_type row=get(fcurrent);
 		if(column>=0 && column<row->count()) // proper index?
@@ -61,10 +61,10 @@ ConstStringPtr Table::item(int column) {
 	return 0; // it's OK we don't have row|column, just return nothing
 }
 
-bool Table::locate(int column, ConstStringPtr value) {
+bool Table::locate(int column, StringPtr value) {
 	int scurrent=fcurrent;
 	for(fcurrent=0; fcurrent<count(); fcurrent++) {
-		ConstStringPtr item_value=item(column);
+		StringPtr item_value=item(column);
 		if(item_value.get() == value.get())
 			return true;
 	}
@@ -73,7 +73,7 @@ bool Table::locate(int column, ConstStri
 	return false;
 }
 
-bool Table::locate(ConstStringPtr column, ConstStringPtr value) {
+bool Table::locate(StringPtr column, StringPtr value) {
 	return locate(column_name2index(column, true), value);
 }