--- parser3/src/include/pa_string.h	2001/02/14 13:40:54	1.20
+++ parser3/src/include/pa_string.h	2001/02/21 11:10:02	1.23
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_string.h,v 1.20 2001/02/14 13:40:54 paf Exp $
+  $Id: pa_string.h,v 1.23 2001/02/21 11:10:02 paf Exp $
 */
 
 /*
@@ -28,17 +28,18 @@
 #include "pa_types.h"
 
 #ifndef NO_STRING_ORIGIN
-#	define STRING_APPEND_PARAMS const char *src, char *file, uint line
-#	define APPEND(src, file, line) real_append(src, file, line)
+#	define STRING_APPEND_PARAMS const char *src, size_t size, char *file, uint line
+#	define APPEND(src, size, file, line) real_append(src, size, file, line)
 #else
-#	define STRING_APPEND_PARAMS const char *src
-#	define APPEND(src, file, line) real_append(src)
+#	define STRING_APPEND_PARAMS const char *src, size_t size
+#	define APPEND(src, size, file, line) real_append(src, size)
 #endif
+#define	APPEND_CONST(src) APPEND(src, 0, 0, 0)
 
-class String_iterator;
+//class String_iterator;
 
 class String : public Pooled {
-	friend String_iterator;
+//	friend String_iterator;
 public:
 	enum {
 		CR_PREALLOCATED_COUNT=5,
@@ -55,7 +56,7 @@ public:
 	char *cstr() const;
 	String& real_append(STRING_APPEND_PARAMS);
 	bool operator == (const String& src) const;
-	String& append(const String_iterator& begin, const String_iterator& end);
+//	String& append(const String_iterator& begin, const String_iterator& end);
 
 	uint hash_code() const;
 
@@ -110,7 +111,7 @@ private: //disabled
 
 };
 
-
+/*
 class Char_types {
 public:
 	Char_types();
@@ -128,6 +129,7 @@ private:
 class String_iterator {
 public:
 	String_iterator(String& astring);
+	String_iterator(String_iterator& asi);
 
 	void operator ++() { skip(); }
 	void operator ++(int) { skip(); }
@@ -155,5 +157,6 @@ protected:
 	// advances position by one char
 	void skip();
 };
+*/
 
 #endif