eas-dev-commit

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

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

Modified Files:
	Makefile.am sxml.cxx sxmlstream.cxx 
Log Message:
mofidifed build process; changes to libsxmlstream (seems that it is still
broken); minor additions over the project


Index: Makefile.am
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	2 Feb 2003 06:59:11 -0000	1.4
+++ Makefile.am	3 Feb 2003 06:30:47 -0000	1.5
@@ -1,5 +1,6 @@
 lib_LTLIBRARIES = libsxmlstream.la  
-libsxmlstream_la_SOURCES = sxml.cxx sxmlstream.cxx
+libsxmlstream_la_SOURCES = sxml.cxx sxmlstream.cxx ../include/sxml.hxx \
+                           ../include/sxmlstream.hxx ../include/sxmlhandler.hxx
 INCLUDES = -I../include -I$(top_srcdir)
 CXXFLAGS = @GLIB_CFLAGS@
 libsxmlstream_la_LIBADD = @GLIB_LIBS@

Index: sxml.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxml.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sxml.cxx	2 Feb 2003 06:59:11 -0000	1.4
+++ sxml.cxx	3 Feb 2003 06:30:47 -0000	1.5
@@ -23,19 +23,26 @@
 
 using namespace std;
 
+namespace openeas { namespace sxmlstream {
+
 SXmlNode::SXmlNode(const SXmlNode& v)
 {
     type=v.type; 
-    *descendants = *(v.descendants); 
+    if (!(v.descendants)->empty())
+       *descendants = *(v.descendants); 
+    else
+       descendants = new list<SXmlNode>;
     data = v.data;
 }
 
 SXmlNode& SXmlNode::operator=(const SXmlNode& v)
 {
     type=v.type; 
-    *descendants = *(v.descendants); 
+    if (!(v.descendants)->empty())
+       *descendants = *(v.descendants); 
+    else
+       descendants = new list<SXmlNode>;
     data = v.data;
-
     return *this;
 }
 
@@ -59,5 +66,4 @@
     return e;
 }
 
-
-
+}; };

Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sxmlstream.cxx	2 Feb 2003 06:59:11 -0000	1.8
+++ sxmlstream.cxx	3 Feb 2003 06:30:47 -0000	1.9
@@ -29,6 +29,8 @@
 
 using namespace std;
 
+namespace openeas { namespace sxmlstream {
+
 typedef list<SXmlNode>::iterator SXmlNode_iterator;
 
 /* SXmlStream */
@@ -168,7 +170,7 @@
 	       SXml_BinaryOutput(os,e);
 	 }
          return os;
-};
+}
 
 SXmlBinaryStream& operator<<(SXmlBinaryStream& s, const ostream& os)
 {
@@ -261,7 +263,7 @@
 	       SXml_TextOutput(os,e);
 	 }
          return os;
-};
+}
 
 SXmlTextStream& operator<<(SXmlTextStream& s, const ostream& os)
 {
@@ -269,3 +271,4 @@
 	// TODO
 }
           
+}; };