dbertoni 01/12/03 14:24:03
Modified: c/Tests/Conf conf.cpp
Log:
Removed broken assumption that all paths should be made absolute.
Revision Changes Path
1.14 +11 -8 xml-xalan/c/Tests/Conf/conf.cpp
Index: conf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Conf/conf.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- conf.cpp 2001/12/03 20:19:00 1.13
+++ conf.cpp 2001/12/03 22:24:03 1.14
@@ -55,8 +55,14 @@
* <http://www.apache.org/>.
*/
+#if defined(XALAN_OLD_STREAM_HEADERS)
+#include <iostream.h>
+#include <strstream.h>
+#else
#include <iostream>
#include <strstream>
+#endif
+
#include <stdio.h>
#if !defined(XALAN_NO_NAMESPACES)
@@ -64,10 +70,7 @@
using std::cout;
using std::cin;
using std::endl;
- using std::ifstream;
- using std::ios_base;
using std::ostrstream;
- using std::string;
#endif
@@ -142,10 +145,10 @@
}
else
{
- if (f.checkDir(pathSep + XalanDOMString(argv[1])))
+ if (f.checkDir(XalanDOMString(argv[1])))
{
assign(baseDir, XalanDOMString(argv[1]));
- insert(baseDir, 0, pathSep);
+// insert(baseDir, 0, pathSep);
}
else
{
@@ -164,8 +167,8 @@
if(i < argc && argv[i][0] != '-')
{
assign(outDir, XalanDOMString(argv[i]));
- insert(outDir, 0, XalanDOMString("\\"));
- append(outDir, XalanDOMString("\\"));
+// insert(outDir, 0, XalanDOMString("\\"));
+ append(outDir, pathSep);
f.checkAndCreateDir(outDir);
fsetOut = false;
}
@@ -181,7 +184,7 @@
if(i < argc && argv[i][0] != '-')
{
assign(goldRoot, XalanDOMString(argv[i]));
- insert(goldRoot, 0, pathSep);
+// insert(goldRoot, 0, pathSep);
fsetGold = false;
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
