amassari 2004/09/28 03:56:04
Modified: c/src/xercesc/dom/deprecated DOMString.cpp NodeImpl.cpp
c/Projects/Win32/BCB6/Xerces-all/XercesLib XercesLib.bpr
Log:
Fixes for Borland C++ (jira# 1267)
Revision Changes Path
1.11 +7 -7 xml-xerces/c/src/xercesc/dom/deprecated/DOMString.cpp
Index: DOMString.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOMString.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DOMString.cpp 8 Sep 2004 13:55:42 -0000 1.10
+++ DOMString.cpp 28 Sep 2004 10:56:04 -0000 1.11
@@ -57,6 +57,12 @@
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)
@@ -310,12 +316,6 @@
// DOMString
//
//------------------------------------------------------------
-
-
-int DOMString::gLiveStringDataCount = 0;
-int DOMString::gTotalStringDataCount = 0;
-int DOMString::gLiveStringHandleCount = 0;
-int DOMString::gTotalStringHandleCount = 0;
DOMString::DOMString()
1.5 +5 -5 xml-xerces/c/src/xercesc/dom/deprecated/NodeImpl.cpp
Index: NodeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/NodeImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NodeImpl.cpp 8 Sep 2004 13:55:43 -0000 1.4
+++ NodeImpl.cpp 28 Sep 2004 10:56:04 -0000 1.5
@@ -57,6 +57,10 @@
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;
@@ -83,10 +87,6 @@
this->ownerNode = ((NodeImpl*)&other)->getOwnerDocument();
this->isOwned(false);
};
-
-
-int NodeImpl::gLiveNodeImpls = 0; // Counters for debug & tuning.
-int NodeImpl::gTotalNodeImpls= 0;
1.21 +16 -7
xml-xerces/c/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
Index: XercesLib.bpr
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XercesLib.bpr 15 Feb 2004 20:15:15 -0000 1.20
+++ XercesLib.bpr 28 Sep 2004 10:56:04 -0000 1.21
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
