--- parser3/src/include/pa_string.h	2008/07/17 09:11:14	1.172
+++ parser3/src/include/pa_string.h	2009/04/23 07:03:12	1.174.2.1
@@ -8,7 +8,7 @@
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
-static const char * const IDENT_STRING_H="$Date: 2008/07/17 09:11:14 $";
+static const char * const IDENT_STRING_H="$Date: 2009/04/23 07:03:12 $";
 
 // includes
 #include "pa_types.h"
@@ -112,9 +112,9 @@ public:
 		struct {
 #ifdef PA_LITTLE_ENDIAN
 			Language lang:8;
-			int is_not_just_lang:sizeof(CORD)*8-8;
+			size_t is_not_just_lang:sizeof(CORD)*8-8;
 #elif defined(PA_BIG_ENDIAN)
-			int is_not_just_lang:sizeof(CORD)*8-8;
+			size_t is_not_just_lang:sizeof(CORD)*8-8;
 			Language lang:8;
 #else
 #	error word endianness not determined for some obscure reason
@@ -479,7 +479,7 @@ public:
 		size_t this_offset=0) const {
 		return body.pos(c, this_offset);
 	}
-	size_t String::pos(Charset& charset,
+	size_t pos(Charset& charset,
 		const String& substr, 
 		size_t this_offset=0, Language lang=L_UNSPECIFIED) const;
 
@@ -519,6 +519,7 @@ public:
 	double as_double() const { return pa_atod(cstr(), this); }
 	int as_int() const { return pa_atoi(cstr(), this); }
 	bool as_bool() const { return as_int()!=0; }
+	const String& escape(Charset& source_charset) const;
 
 private: //disabled