amassari 2005/01/08 06:24:20
Modified: c/src/xercesc/com NodeContainerImpl.h XMLDOMDocument.cpp
Log:
Fixes to compile with Visual Studio 2005 (jira# 1253)
Revision Changes Path
1.4 +3 -1 xml-xerces/c/src/xercesc/com/NodeContainerImpl.h
Index: NodeContainerImpl.h
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/NodeContainerImpl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NodeContainerImpl.h 8 Sep 2004 13:55:35 -0000 1.3
+++ NodeContainerImpl.h 8 Jan 2005 14:24:20 -0000 1.4
@@ -116,6 +116,8 @@
VARIANT m_NextVar;
};
+ typedef iterator const_iterator;
+
NodeContainerImpl()
:m_NextNodeIndex(0)
,m_pIXMLDOMDocument(NULL)
1.9 +6 -4 xml-xerces/c/src/xercesc/com/XMLDOMDocument.cpp
Index: XMLDOMDocument.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/com/XMLDOMDocument.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLDOMDocument.cpp 8 Sep 2004 13:55:35 -0000 1.8
+++ XMLDOMDocument.cpp 8 Jan 2005 14:24:20 -0000 1.9
@@ -926,13 +926,15 @@
// try appending baseurl if exists
_bstr_t baseURL;
if (S_OK == GetBaseURL(baseURL)) {
+ TCHAR szCurFile[MAX_PATH];
+ _tcscpy(szCurFile, m_FileName);
// change any backslashes to slashes
- LPTSTR loc = _tcschr(m_FileName,_T('\\'));
+ LPTSTR loc = _tcschr(szCurFile,_T('\\'));
while (loc != NULL) {
*loc = _T('/');
- loc = _tcschr(m_FileName,_T('\\'));
+ loc = _tcschr(szCurFile,_T('\\'));
}
- m_FileName = baseURL + _T("/") + m_FileName;
+ m_FileName = baseURL + _T("/") + szCurFile;
}
else {
TCHAR szCurDir[MAX_PATH];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
