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...@apache.org on 2002/04/12 08:47:34 UTC
cvs commit: xml-xalan/c/Tests/Transformer TestXalanTransformer.cpp Transformer.dsp
dbertoni 02/04/11 23:47:34
Modified: c/Tests/Compare compare.cpp
c/Tests/Dom2Dom dom2dom.cpp
c/Tests/Performance perf.cpp
c/Tests/Threads ThreadTest.cpp ThreadTest.dsp
c/Tests/Transformer TestXalanTransformer.cpp Transformer.dsp
Log:
General clean and fixes.
Revision Changes Path
1.13 +3 -3 xml-xalan/c/Tests/Compare/compare.cpp
Index: compare.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Compare/compare.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- compare.cpp 17 Dec 2001 14:44:14 -0000 1.12
+++ compare.cpp 12 Apr 2002 06:47:34 -0000 1.13
@@ -78,9 +78,9 @@
// Are included by FileUtility.hpp
// HARNESS HEADERS...
-#include <XMLFileReporter.hpp>
-#include <FileUtility.hpp>
-#include <HarnessInit.hpp>
+#include <Harness/XMLFileReporter.hpp>
+#include <Harness/FileUtility.hpp>
+#include <Harness/HarnessInit.hpp>
#if defined(XALAN_NO_NAMESPACES)
typedef map<XalanDOMString, XalanDOMString, less<XalanDOMString> > Hashtable;
1.5 +2 -2 xml-xalan/c/Tests/Dom2Dom/dom2dom.cpp
Index: dom2dom.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Dom2Dom/dom2dom.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dom2dom.cpp 22 Jan 2002 18:50:54 -0000 1.4
+++ dom2dom.cpp 12 Apr 2002 06:47:34 -0000 1.5
@@ -68,8 +68,8 @@
#include <crtdbg.h>
#endif
-#include <sax/SAXException.hpp>
-#include <util/PlatformUtils.hpp>
+#include <xercesc/sax/SAXException.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
#include <PlatformSupport/DOMStringHelper.hpp>
1.30 +1 -1 xml-xalan/c/Tests/Performance/perf.cpp
Index: perf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Performance/perf.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- perf.cpp 22 Jan 2002 18:50:55 -0000 1.29
+++ perf.cpp 12 Apr 2002 06:47:34 -0000 1.30
@@ -68,7 +68,7 @@
#include <vector>
-#include <util/PlatformUtils.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
#include <PlatformSupport/DOMStringHelper.hpp>
#include <PlatformSupport/XalanFileOutputStream.hpp>
1.20 +13 -3 xml-xalan/c/Tests/Threads/ThreadTest.cpp
Index: ThreadTest.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Threads/ThreadTest.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ThreadTest.cpp 4 Jan 2002 21:19:11 -0000 1.19
+++ ThreadTest.cpp 12 Apr 2002 06:47:34 -0000 1.20
@@ -16,8 +16,8 @@
-#include <util/PlatformUtils.hpp>
-#include <util/Mutexes.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#include <xercesc/util/Mutexes.hpp>
@@ -39,6 +39,11 @@
#elif defined(XALAN_POSIX2_AVAILABLE)
#include <csignal>
+
+// This is a workaround for a Tru64 compiler bug...
+#if defined(XALAN_STRICT_ANSI_HEADERS) && defined(TRU64)
+#include <setjmp.h>
+#endif
#include <pthread.h>
#include <unistd.h>
@@ -52,6 +57,11 @@
using std::cerr;
using std::cout;
using std::endl;
+#if defined(XALAN_STRICT_ANSI_HEADERS)
+ using std::atoi;
+ using std::signal;
+ using std::strcmp;
+#endif
#endif
@@ -188,7 +198,7 @@
{
fContinue = false;
}
-};
+}
#else
#error Unsupported platform!
#endif
1.8 +7 -7 xml-xalan/c/Tests/Threads/ThreadTest.dsp
Index: ThreadTest.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Threads/ThreadTest.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ThreadTest.dsp 7 Jun 2001 16:29:06 -0000 1.7
+++ ThreadTest.dsp 12 Apr 2002 06:47:34 -0000 1.8
@@ -26,7 +26,7 @@
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
RSC=rc.exe
!IF "$(CFG)" == "ThreadTest - Win32 Release"
@@ -50,9 +50,9 @@
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib ..\..\Build\Win32\VC6\Release\*.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386
!ELSEIF "$(CFG)" == "ThreadTest - Win32 Debug"
@@ -75,9 +75,9 @@
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1D.lib ..\..\Build\Win32\VC6\Debug\*.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "ThreadTest - Win32 Release with symbols"
@@ -102,9 +102,9 @@
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib ..\..\Build\Win32\VC6\Release\*.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\c\Build\Win32\VC6\Release/ThreadTest.exe"
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib ..\..\Build\Win32\VC6\Release.symbols\*.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /fixed:no
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /fixed:no
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.6 +2 -2 xml-xalan/c/Tests/Transformer/TestXalanTransformer.cpp
Index: TestXalanTransformer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Transformer/TestXalanTransformer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestXalanTransformer.cpp 7 Nov 2001 04:01:58 -0000 1.5
+++ TestXalanTransformer.cpp 12 Apr 2002 06:47:34 -0000 1.6
@@ -66,7 +66,7 @@
-#include <util/PlatformUtils.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
#if defined(TEST_XALAN_CPP)
@@ -91,7 +91,7 @@
#include <XalanTransformer/XalanCAPI.h>
-#include <stdio.h>
+#include <cstdio>
#endif
1.4 +7 -7 xml-xalan/c/Tests/Transformer/Transformer.dsp
Index: Transformer.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Transformer/Transformer.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Transformer.dsp 22 Jan 2002 18:50:55 -0000 1.3
+++ Transformer.dsp 12 Apr 2002 06:47:34 -0000 1.4
@@ -26,7 +26,7 @@
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
MTL=midl.exe
RSC=rc.exe
@@ -53,9 +53,9 @@
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib ..\..\Build\Win32\VC6\Release\*.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386
!ELSEIF "$(CFG)" == "Transformer - Win32 Debug"
@@ -79,9 +79,9 @@
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1D.lib ..\..\Build\Win32\VC6\Debug\*.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1D.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Transformer - Win32 Release with symbols"
@@ -109,9 +109,9 @@
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.exe
# ADD BASE LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib ..\..\Build\Win32\VC6\Release\*.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib ..\..\Build\Win32\VC6\Release.symbols\XalanDOMS.lib ..\..\Build\Win32\VC6\Release.symbols\XSLTS.lib ..\..\Build\Win32\VC6\Release.symbols\XalanTransformerS.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /debug /machine:I386 /fixed:no
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /debug /machine:I386 /fixed:no
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org