Author: amassari
Date: Fri May 19 12:18:38 2006
New Revision: 407888
URL: http://svn.apache.org/viewvc?rev=407888&view=rev
Log:
Corrections needed by MSVC compiler
Modified:
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp
xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp
xerces/c/trunk/tests/src/DOM/Normalizer/Normalizer.cpp
xerces/c/trunk/tests/src/DOM/RangeTest/RangeTest.cpp
xerces/c/trunk/tests/src/DOM/Traversal/Traversal.cpp
xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp
Modified:
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj?rev=407888&r1=407887&r2=407888&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
(original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
Fri May 19 12:18:38 2006
@@ -44,7 +44,7 @@
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="ws2_32.lib advapi32.lib
"
OutputFile="$(OutDir)\xerces-c_3_0.dll"
- LinkIncremental="1"
+ LinkIncremental="0"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
@@ -112,7 +112,7 @@
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="ws2_32.lib advapi32.lib
"
OutputFile="$(OutDir)\xerces-c_3_0D.dll"
- LinkIncremental="2"
+ LinkIncremental="0"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
Modified:
xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp?rev=407888&r1=407887&r2=407888&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
(original)
+++ xerces/c/trunk/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
Fri May 19 12:18:38 2006
@@ -25,7 +25,6 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/XMLUni.hpp>
-#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp>
#include <xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.hpp>
Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp?rev=407888&r1=407887&r2=407888&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDValidator.cpp Fri May 19
12:18:38 2006
@@ -381,8 +381,11 @@
}
-void DTDValidator::preContentValidation(bool /*reuseGrammar*/,
- bool validateDefAttr)
+void DTDValidator::preContentValidation(bool
+#if defined(XERCES_DEBUG)
+
reuseGrammar
+#endif
+ ,bool validateDefAttr)
{
//
// Lets enumerate all of the elements in the element decl pool
Modified: xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp?rev=407888&r1=407887&r2=407888&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp Fri May 19 12:18:38
2006
@@ -36,7 +36,7 @@
bool errorOccurred = false;
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
#define TASSERT(c) tassert((c), __FILE__, __LINE__)
Modified: xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp?rev=407888&r1=407887&r2=407888&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp Fri May 19 12:18:38 2006
@@ -36,7 +36,7 @@
#include <xercesc/util/OutOfMemoryException.hpp>
#include <xercesc/framework/MemBufInputSource.hpp>
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
#define EXCEPTIONSTEST(operation, expectedException, resultFlag, testNum) \
{ \
@@ -830,7 +830,7 @@
*
*
*/
-int main(int /*argc*/, char **/*argv*/)
+int main(int /*argc*/, char ** /*argv*/)
{
bool OK = true;
Modified: xerces/c/trunk/tests/src/DOM/Normalizer/Normalizer.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/DOM/Normalizer/Normalizer.cpp?rev=407888&r1=407887&r2=407888&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/DOM/Normalizer/Normalizer.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/Normalizer/Normalizer.cpp Fri May 19 12:18:38
2006
@@ -218,7 +218,7 @@
theOutput->release();
}
-int main(int /*argc*/, char **/*argv*/) {
+int main(int /*argc*/, char ** /*argv*/) {
Normalizer *normalizer = new Normalizer();
Modified: xerces/c/trunk/tests/src/DOM/RangeTest/RangeTest.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/DOM/RangeTest/RangeTest.cpp?rev=407888&r1=407887&r2=407888&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/DOM/RangeTest/RangeTest.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/RangeTest/RangeTest.cpp Fri May 19 12:18:38
2006
@@ -41,7 +41,7 @@
bool errorOccurred = false;
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
#define TASSERT(c) tassert((c), __FILE__, __LINE__)
Modified: xerces/c/trunk/tests/src/DOM/Traversal/Traversal.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/DOM/Traversal/Traversal.cpp?rev=407888&r1=407887&r2=407888&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/DOM/Traversal/Traversal.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/Traversal/Traversal.cpp Fri May 19 12:18:38
2006
@@ -41,7 +41,7 @@
bool errorOccurred = false;
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
#define TASSERT(c) tassert((c), __FILE__, __LINE__)
Modified: xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp?rev=407888&r1=407887&r2=407888&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/TypeInfo/TypeInfo.cpp Fri May 19 12:18:38 2006
@@ -30,7 +30,7 @@
#include <iostream.h>
#endif
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
#define DOMTYPEINFOTEST(info, type, uri, line) \
tmp = XMLString::equals(info->getTypeName(), type) &&
XMLString::equals(info->getTypeNamespace(), uri);\
@@ -825,7 +825,7 @@
return (DOMElement *)toTest;
}
-int main(int /*argc*/, char **/*argv*/)
+int main(int /*argc*/, char ** /*argv*/)
{
bool passed = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
