diff --git a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
index cb6e863e35de05cbabac83cdf4cd2ef65b1c8f84..d2e9e3d117fdad5f5a5f25baf04573f453de56bc 100644
--- a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
+++ b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
@@ -349,7 +349,11 @@
..\..\..\..\..\Build\Win32\BCB6\obj\XSObjectFactory.obj
..\..\..\..\..\Build\Win32\BCB6\obj\XMLIBM1047Transcoder.obj
..\..\..\..\..\Build\Win32\BCB6\obj\XMLCanRepGroup.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\BinMemOutputStream.obj"/>
+ ..\..\..\..\..\Build\Win32\BCB6\obj\BinMemOutputStream.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XMLRegisterCleanup.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XSValue.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\XSAXMLScanner.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\IdentityConstraintHandler.obj"/>
<RESFILES value="..\..\..\..\..\src\xercesc\util\Platforms\Win32\Version.res"/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
@@ -366,7 +370,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="PLATFORM_WIN32;_CRTDBG_MAP_ALLOC;PROJ_XMLPARSER;PROJ_XMLUTIL;PROJ_PARSERS;PROJ_SAX4C;PROJ_SAX2;PROJ_DOM;PROJ_VALIDATORS;XML_SINGLEDLL;XML_USE_WIN32_TRANSCODER;XML_USE_INMEM_MESSAGELOADER;XML_USE_NETACCESSOR_WINSOCK;_DEBUG"/>
+ <USERDEFINES value="PLATFORM_WIN32;_CRTDBG_MAP_ALLOC;PROJ_XMLPARSER;PROJ_XMLUTIL;PROJ_PARSERS;PROJ_SAX4C;PROJ_SAX2;PROJ_DOM;PROJ_VALIDATORS;XML_SINGLEDLL;XML_USE_WIN32_TRANSCODER;XML_USE_INMEM_MESSAGELOADER;XML_USE_NETACCESSOR_WINSOCK;_DEBUG;PROJ_DEPRECATED_DOM"/>
<SYSDEFINES value="NO_STRICT;_RTLDLL;USEPACKAGES"/>
<MAINSOURCE value="Xerceslib.cpp"/>
<INCLUDEPATH value="..\..\..\..\..\src;$(BCB)\include"/>
@@ -375,11 +379,11 @@
<OTHERFILES value=""/>
</MACROS>
<OPTIONS>
- <IDLCFLAGS value="-I..\..\..\..\..\src\xercesc -I$(BCB)\include -src_suffix cpp
- -DPLATFORM_WIN32 -D_CRTDBG_MAP_ALLOC -DPROJ_XMLPARSER -DPROJ_XMLUTIL
- -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_VALIDATORS
- -DXML_SINGLEDLL -DXML_USE_WIN32_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER
- -DXML_USE_NETACCESSOR_WINSOCK -D_DEBUG -boa"/>
+ <IDLCFLAGS value="-I..\..\..\..\..\src -I$(BCB)\include -src_suffix cpp -DPLATFORM_WIN32
+ -D_CRTDBG_MAP_ALLOC -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS
+ -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_VALIDATORS -DXML_SINGLEDLL
+ -DXML_USE_WIN32_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER
+ -DXML_USE_NETACCESSOR_WINSOCK -D_DEBUG -DPROJ_DEPRECATED_DOM -boa"/>
<CFLAG1 value="-WD -Od -Q -Vx -Ve -X- -r- -a8 -b -k -y -v -vi- -tWD -tWM -c"/>
<PFLAGS value="-N2..\..\..\..\..\Build\Win32\BCB6\obj
-N0..\..\..\..\..\Build\Win32\BCB6\obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
@@ -742,6 +746,11 @@
<FILE FILENAME="..\..\..\..\..\src\xercesc\internal\XSObjectFactory.cpp" FORMNAME="" UNITNAME="XSObjectFactory" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLIBM1047Transcoder.cpp" FORMNAME="" UNITNAME="XMLIBM1047Transcoder" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\validators\datatype\XMLCanRepGroup.cpp" FORMNAME="" UNITNAME="XMLCanRepGroup" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\internal\BinMemOutputStream.cpp" FORMNAME="" UNITNAME="BinMemOutputStream" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\framework\psvi\XSValue.cpp" FORMNAME="" UNITNAME="XSValue" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\internal\XSAXMLScanner.cpp" FORMNAME="" UNITNAME="XSAXMLScanner" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\util\XMLRegisterCleanup.cpp" FORMNAME="" UNITNAME="XMLRegisterCleanup" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\validators\schema\identity\IdentityConstraintHandler.cpp" FORMNAME="" UNITNAME="IdentityConstraintHandler" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
diff --git a/src/xercesc/dom/deprecated/DOMString.cpp b/src/xercesc/dom/deprecated/DOMString.cpp
index bbbeb5bdc340989256573faf2612d81971524912..58ca68fd8507e70bc2bf7f63499d3cdd882e96b2 100644
--- a/src/xercesc/dom/deprecated/DOMString.cpp
+++ b/src/xercesc/dom/deprecated/DOMString.cpp
@@ -57,6 +57,12 @@ XMLLCPTranscoder* getDomConverter();
static XMLLCPTranscoder* gDomConverter = 0;
static XMLRegisterCleanup cleanupDomConverter;
+int DOMString::gLiveStringDataCount = 0;
+int DOMString::gTotalStringDataCount = 0;
+int DOMString::gLiveStringHandleCount = 0;
+int DOMString::gTotalStringHandleCount = 0;
+
+
XMLLCPTranscoder* getDomConverter()
{
if (!gDomConverter)
@@ -312,12 +318,6 @@ DOMStringHandle *DOMStringHandle::cloneStringHandle()
//------------------------------------------------------------
-int DOMString::gLiveStringDataCount = 0;
-int DOMString::gTotalStringDataCount = 0;
-int DOMString::gLiveStringHandleCount = 0;
-int DOMString::gTotalStringHandleCount = 0;
-
-
DOMString::DOMString()
{
fHandle = 0;
diff --git a/src/xercesc/dom/deprecated/NodeImpl.cpp b/src/xercesc/dom/deprecated/NodeImpl.cpp
index 31f968c4e76279043048b4202a13777c98e9a8fa..2bf6857c0acee2a8f2950a1e25022b35cddce179 100644
--- a/src/xercesc/dom/deprecated/NodeImpl.cpp
+++ b/src/xercesc/dom/deprecated/NodeImpl.cpp
@@ -57,6 +57,10 @@ const unsigned short NodeImpl::USERDATA = 0x1<<9;
const unsigned short NodeImpl::HASSTRING = 0x1<<10;
+int NodeImpl::gLiveNodeImpls = 0; // Counters for debug & tuning.
+int NodeImpl::gTotalNodeImpls= 0;
+
+
NodeImpl::NodeImpl(DocumentImpl *ownerDoc)
{
this->flags = 0;
@@ -85,10 +89,6 @@ NodeImpl::NodeImpl(const NodeImpl &other) {
};
-int NodeImpl::gLiveNodeImpls = 0; // Counters for debug & tuning.
-int NodeImpl::gTotalNodeImpls= 0;
-
-
NodeImpl::~NodeImpl() {
if (hasUserData())