eas-dev-commit

[Yurii R. <yr...@us...>]

Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4466/libs/libsxmlstream/src

Modified Files:
	sxmlstream.cxx 
Log Message:
Changes in build process;
libsxmlstream major bugs fixed (it still not have most of functionality yet,
however)


Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sxmlstream.cxx	27 Jan 2003 06:07:41 -0000	1.2
+++ sxmlstream.cxx	28 Jan 2003 03:18:23 -0000	1.3
@@ -25,6 +25,8 @@
 
 using namespace std;
 
+typedef vector<SXml>::iterator sxml_iterator;
+
 /* SXmlStream */
 
 SXmlStream::SXmlStream()
@@ -59,7 +61,7 @@
 /* SXmlTextStream operators */
 ostream& SXml_TextOutput(ostream& os, SXml e)
 {
-       iterator iter;
+       sxml_iterator iter;
        switch (e.type)
 	       {
 	          case SXml_Element_t:
@@ -69,21 +71,21 @@
 		       iter = (e.childs)->begin();
 		       while (iter!=(e.childs)->end())
 		       {
-			       if (Is_SXml_Attribute(iter))
+			       if (Is_SXml_Attribute((*iter)))
 			       {
 				       os << "(@ ";
-				       SXml_TextOutput(os,iter);
-				       os >> ")";
+				       SXml_TextOutput(os,(*iter));
+				       os << ")";
 			       }
-			       it++;
+			       iter++;
 		       }
 		       // Output childs
 		       iter = (e.childs)->begin();
 		       while (iter!=(e.childs)->end())
 		       {
-			       if (!Is_SXml_Attribute(iter))
+			       if (!Is_SXml_Attribute((*iter)))
 			       {
-				       SXml_TextOutput(os,iter);
+				       SXml_TextOutput(os,(*iter));
 			       }
 			       iter++;
 		       }
@@ -114,7 +116,6 @@
 		  default:
 		       break;       
 	       }
-       delete iter;
        return os;
 }
 
@@ -124,7 +125,7 @@
          while (!s.queueIsEmpty())
 	 {
 	       e = s.pop();
-	       os << SXml_OutputText(os,e);
+	       os << SXml_TextOutput(os,e);
 	 }
          return os;
 };