You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@locus.apache.org on 2000/04/11 16:41:54 UTC
cvs commit: xml-xalan/c/src/XercesPlatformSupport TextFileOutputStream.cpp TextFileOutputStream.hpp
dbertoni 00/04/11 07:41:53
Modified: c/src/XercesPlatformSupport TextFileOutputStream.cpp
TextFileOutputStream.hpp
Log:
Fixed merge conflicts.
Revision Changes Path
1.10 +3 -7 xml-xalan/c/src/XercesPlatformSupport/TextFileOutputStream.cpp
Index: TextFileOutputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesPlatformSupport/TextFileOutputStream.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TextFileOutputStream.cpp 2000/03/31 18:57:15 1.9
+++ TextFileOutputStream.cpp 2000/04/11 14:41:51 1.10
@@ -64,24 +64,20 @@
-#include <util/Janitor.hpp>
-#include <util/XMLString.hpp>
-
-
-
#include <PlatformSupport/DOMStringHelper.hpp>
#include <PlatformSupport/STLHelper.hpp>
+
TextFileOutputStream::TextFileOutputStream(const DOMString& theFileName) :
XercesTextOutputStream(),
m_fileName(theFileName),
m_handle(0)
{
- char* const tmpName = XMLString::transcode(toCharArray(theFileName));
+ char* const tmpName = theFileName.transcode();
- ArrayJanitor<char> janTmp(tmpName);
+ array_auto_ptr<char> janTmp(tmpName);
m_handle = fopen(tmpName, "wt");
1.5 +1 -2 xml-xalan/c/src/XercesPlatformSupport/TextFileOutputStream.hpp
Index: TextFileOutputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesPlatformSupport/TextFileOutputStream.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TextFileOutputStream.hpp 2000/03/31 18:57:15 1.4
+++ TextFileOutputStream.hpp 2000/04/11 14:41:51 1.5
@@ -63,6 +63,7 @@
#include <XercesPlatformSupport/XercesPlatformSupportDefinitions.hpp>
+
#include <cstdio>
#include <vector>
@@ -143,7 +144,6 @@
virtual
~TextFileOutputStreamOpenException();
-
};
@@ -165,7 +165,6 @@
virtual
~TextFileOutputStreamWriteException();
-
};