From 32d1fcaf50498cd696d70a5ca12ea08c4889855d Mon Sep 17 00:00:00 2001
From: Alberto Massari <amassari@apache.org>
Date: Fri, 19 May 2006 19:18:38 +0000
Subject: [PATCH] Corrections needed by MSVC compiler
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@407888 13f79535-47bb-0310-9956-ffa450edef68
---
Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj | 4 ++--
.../util/NetAccessors/WinSock/WinSockNetAccessor.cpp | 1 -
src/xercesc/validators/DTD/DTDValidator.cpp | 7 +++++--
tests/src/DOM/DOMMemTest/DOMMemTest.cpp | 2 +-
tests/src/DOM/DOMTest/DTest.cpp | 4 ++--
tests/src/DOM/Normalizer/Normalizer.cpp | 2 +-
tests/src/DOM/RangeTest/RangeTest.cpp | 2 +-
tests/src/DOM/Traversal/Traversal.cpp | 2 +-
tests/src/DOM/TypeInfo/TypeInfo.cpp | 4 ++--
9 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
index cde3cc199..1d09f2dee 100644
--- a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
@@ -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"
diff --git a/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp b/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
index 821834436..0001173ed 100644
--- a/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
+++ b/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
@@ -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>
diff --git a/src/xercesc/validators/DTD/DTDValidator.cpp b/src/xercesc/validators/DTD/DTDValidator.cpp
index da9c43515..240810760 100644
--- a/src/xercesc/validators/DTD/DTDValidator.cpp
+++ b/src/xercesc/validators/DTD/DTDValidator.cpp
@@ -381,8 +381,11 @@ DTDValidator::validateAttrValue(const XMLAttDef* attDef
}
-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
diff --git a/tests/src/DOM/DOMMemTest/DOMMemTest.cpp b/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
index 2a1fec33b..7347462d4 100644
--- a/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
+++ b/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
@@ -36,7 +36,7 @@ XERCES_CPP_NAMESPACE_USE
bool errorOccurred = false;
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
#define TASSERT(c) tassert((c), __FILE__, __LINE__)
diff --git a/tests/src/DOM/DOMTest/DTest.cpp b/tests/src/DOM/DOMTest/DTest.cpp
index 435c61a94..54625cf8a 100644
--- a/tests/src/DOM/DOMTest/DTest.cpp
+++ b/tests/src/DOM/DOMTest/DTest.cpp
@@ -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 @@ void DOMTest::findTestNodes(DOMNode* node) {
*
*
*/
-int main(int /*argc*/, char **/*argv*/)
+int main(int /*argc*/, char ** /*argv*/)
{
bool OK = true;
diff --git a/tests/src/DOM/Normalizer/Normalizer.cpp b/tests/src/DOM/Normalizer/Normalizer.cpp
index cc1f2de15..30d405b69 100644
--- a/tests/src/DOM/Normalizer/Normalizer.cpp
+++ b/tests/src/DOM/Normalizer/Normalizer.cpp
@@ -218,7 +218,7 @@ void Normalizer::serializeNode(const DOMNode * const node) {
theOutput->release();
}
-int main(int /*argc*/, char **/*argv*/) {
+int main(int /*argc*/, char ** /*argv*/) {
Normalizer *normalizer = new Normalizer();
diff --git a/tests/src/DOM/RangeTest/RangeTest.cpp b/tests/src/DOM/RangeTest/RangeTest.cpp
index b8b831771..d74ce5942 100644
--- a/tests/src/DOM/RangeTest/RangeTest.cpp
+++ b/tests/src/DOM/RangeTest/RangeTest.cpp
@@ -41,7 +41,7 @@ XERCES_CPP_NAMESPACE_USE
bool errorOccurred = false;
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
#define TASSERT(c) tassert((c), __FILE__, __LINE__)
diff --git a/tests/src/DOM/Traversal/Traversal.cpp b/tests/src/DOM/Traversal/Traversal.cpp
index 332773905..5e1e7d0a4 100644
--- a/tests/src/DOM/Traversal/Traversal.cpp
+++ b/tests/src/DOM/Traversal/Traversal.cpp
@@ -41,7 +41,7 @@ XERCES_CPP_NAMESPACE_USE
bool errorOccurred = false;
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
#define TASSERT(c) tassert((c), __FILE__, __LINE__)
diff --git a/tests/src/DOM/TypeInfo/TypeInfo.cpp b/tests/src/DOM/TypeInfo/TypeInfo.cpp
index 70b9d20a2..092ada8dc 100644
--- a/tests/src/DOM/TypeInfo/TypeInfo.cpp
+++ b/tests/src/DOM/TypeInfo/TypeInfo.cpp
@@ -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 @@ DOMElement* TypeInfo::findElement(const XMLCh *name) const {
return (DOMElement *)toTest;
}
-int main(int /*argc*/, char **/*argv*/)
+int main(int /*argc*/, char ** /*argv*/)
{
bool passed = true;
--
GitLab