jberry 2002/11/13 09:37:40
Modified: c/src/xercesc/util/NetAccessors/MacOSURLAccessCF
URLAccessCFBinInputStream.cpp
URLAccessCFBinInputStream.hpp
c/src/xercesc/util/Platforms/MacOS MacOSDefs.hpp
MacOSPlatformUtils.cpp MacOSPlatformUtils.hpp
c/src/xercesc/util/Transcoders/MacOSUnicodeConverter
MacOSUnicodeConverter.cpp MacOSUnicodeConverter.hpp
Log:
Update Mac OS build for compatiblity with namespace additions
Revision Changes Path
1.3 +4 -4
xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp
Index: URLAccessCFBinInputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLAccessCFBinInputStream.cpp 4 Nov 2002 15:11:38 -0000 1.2
+++ URLAccessCFBinInputStream.cpp 13 Nov 2002 17:37:36 -0000 1.3
@@ -61,14 +61,14 @@
* $Id$
*/
+#include <cstdlib>
+#include <cstring>
+
#include <xercesc/util/XMLNetAccessor.hpp>
#include <xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/Janitor.hpp>
-
-#include <cstdlib>
-#include <cstring>
XERCES_CPP_NAMESPACE_BEGIN
1.4 +2 -3
xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp
Index: URLAccessCFBinInputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/MacOSURLAccessCF/URLAccessCFBinInputStream.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URLAccessCFBinInputStream.hpp 4 Nov 2002 15:11:38 -0000 1.3
+++ URLAccessCFBinInputStream.hpp 13 Nov 2002 17:37:36 -0000 1.4
@@ -69,8 +69,6 @@
#include <xercesc/util/XMLExceptMsgs.hpp>
#include <xercesc/util/BinInputStream.hpp>
-XERCES_CPP_NAMESPACE_BEGIN
-
#if defined(__APPLE__)
// Framework includes from ProjectBuilder
#include <CoreServices/CoreServices.h>
@@ -80,6 +78,7 @@
#include <CFURLAccess.h>
#endif
+XERCES_CPP_NAMESPACE_BEGIN
//
// This class implements the BinInputStream interface specified by the XML
1.3 +5 -5 xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSDefs.hpp
Index: MacOSDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSDefs.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MacOSDefs.hpp 21 May 2002 20:31:47 -0000 1.2
+++ MacOSDefs.hpp 13 Nov 2002 17:37:36 -0000 1.3
@@ -59,7 +59,6 @@
*/
-
#ifndef MACOS_DEFS_HPP
#define MACOS_DEFS_HPP
@@ -68,11 +67,12 @@
// ---------------------------------------------------------------------------
#define ENDIANMODE_BIG
-
// ---------------------------------------------------------------------------
// Define all the required platform types
+//
+// FileHandle is a pointer to XMLMacAbstractFile. Due to namespace
+// declaration issues, it is declared here as a void*.
// ---------------------------------------------------------------------------
-class XMLMacAbstractFile;
-typedef XMLMacAbstractFile* FileHandle;
+typedef void* FileHandle;
#endif
1.9 +31 -32
xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp
Index: MacOSPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MacOSPlatformUtils.cpp 4 Nov 2002 15:13:00 -0000 1.8
+++ MacOSPlatformUtils.cpp 13 Nov 2002 17:37:36 -0000 1.9
@@ -62,13 +62,36 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
+#include <cstring>
+#include <cstdlib>
+#include <cctype>
+#include <cstdio>
+#include <memory>
+#include <algorithm>
+
+#if defined(__APPLE__)
+ // Include from Frameworks Headers under ProjectBuilder
+ #include <Carbon/Carbon.h>
+#else
+ // Classic include styles
+ #include <Files.h>
+ #include <Gestalt.h>
+ #include <TextUtils.h>
+ #include <TextEncodingConverter.h>
+ #include <Multiprocessing.h>
+ #include <DriverSynchronization.h>
+ #include <DriverServices.h>
+ #include <CFString.h>
+ #include <URLAccess.h>
+#endif
+
+#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/RuntimeException.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/Platforms/MacOS/MacOSDefs.hpp>
#include <xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp>
#if (defined(XML_USE_INMEMORY_MSGLOADER) || defined(XML_USE_INMEM_MESSAGELOADER))
@@ -91,30 +114,6 @@
#include <xercesc/util/NetAccessors/MacOSURLAccess/MacOSURLAccess.hpp>
#endif
-
-#include <cstring>
-#include <cstdlib>
-#include <cctype>
-#include <cstdio>
-#include <memory>
-#include <algorithm>
-
-#if defined(__APPLE__)
- // Include from Frameworks Headers under ProjectBuilder
- #include <Carbon/Carbon.h>
-#else
- // Classic include styles
- #include <Files.h>
- #include <Gestalt.h>
- #include <TextUtils.h>
- #include <TextEncodingConverter.h>
- #include <Multiprocessing.h>
- #include <DriverSynchronization.h>
- #include <DriverServices.h>
- #include <CFString.h>
- #include <URLAccess.h>
-#endif
-
XERCES_CPP_NAMESPACE_BEGIN
//----------------------------------------------------------------------------
@@ -562,19 +561,19 @@
unsigned int
XMLPlatformUtils::curFilePos(const FileHandle theFile)
{
- return theFile->currPos();
+ return reinterpret_cast<XMLMacAbstractFile*>(theFile)->currPos();
}
void
XMLPlatformUtils::closeFile(const FileHandle theFile)
{
- theFile->close();
+ reinterpret_cast<XMLMacAbstractFile*>(theFile)->close();
}
unsigned int
XMLPlatformUtils::fileSize(const FileHandle theFile)
{
- return theFile->size();
+ return reinterpret_cast<XMLMacAbstractFile*>(theFile)->size();
}
@@ -635,7 +634,7 @@
, const unsigned int toRead
, XMLByte* const toFill)
{
- return theFile->read(toRead, toFill);
+ return reinterpret_cast<XMLMacAbstractFile*>(theFile)->read(toRead, toFill);
}
@@ -644,14 +643,14 @@
, const long toWrite
, const XMLByte* const toFlush)
{
- return theFile->write(toWrite, toFlush);
+ return reinterpret_cast<XMLMacAbstractFile*>(theFile)->write(toWrite, toFlush);
}
void
XMLPlatformUtils::resetFile(FileHandle theFile)
{
- theFile->reset();
+ reinterpret_cast<XMLMacAbstractFile*>(theFile)->reset();
}
1.6 +2 -2
xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp
Index: MacOSPlatformUtils.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MacOSPlatformUtils.hpp 4 Nov 2002 15:13:00 -0000 1.5
+++ MacOSPlatformUtils.hpp 13 Nov 2002 17:37:36 -0000 1.6
@@ -60,8 +60,8 @@
#pragma once
-#include <xercesc/util/XercesDefs.hpp>
#include <cstdlib>
+#include <xercesc/util/XercesDefs.hpp>
#if defined(__APPLE__)
// Framework includes from ProjectBuilder
1.7 +22 -20
xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
Index: MacOSUnicodeConverter.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MacOSUnicodeConverter.cpp 4 Nov 2002 15:14:34 -0000 1.6
+++ MacOSUnicodeConverter.cpp 13 Nov 2002 17:37:36 -0000 1.7
@@ -62,24 +62,15 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
-#include <xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp>
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/XMLUni.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/TranscodingException.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/Janitor.hpp>
-#include <xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp>
+#include <algorithm>
+#include <cstddef>
+#include <cstring>
#if defined(XML_METROWERKS) || (__GNUC__ >= 3 && _GLIBCPP_USE_WCHAR_T)
// Only used under metrowerks.
#include <cwctype>
#endif
-#include <algorithm>
-#include <cstddef>
-#include <cstring>
-
#if defined(__APPLE__)
// Framework includes from ProjectBuilder
#include <CoreServices/CoreServices.h>
@@ -97,6 +88,15 @@
#include <CFString.h>
#endif
+#include <xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp>
+#include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/XMLUni.hpp>
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/TranscodingException.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#include <xercesc/util/Janitor.hpp>
+#include <xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp>
+
XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
@@ -105,7 +105,7 @@
// TempUniBuf is used for cases where we need a temporary conversion due to
// a mismatch between UniChar (the 16-bit type that the Unicode converter uses)
-// and XMLCH (the type that Xerces uses to represent a Unicode character).
+// and XMLCh (the type that Xerces uses to represent a Unicode character).
// In the case of Metrowerks, these are the same size. For ProjectBuilder, they
// used to differ, but they are now the same since XMLCh is now always fixed
// as a 16 bit character, rather than floating with wchar_t as it used to.
@@ -463,11 +463,12 @@
#if TARGET_API_MAC_CARBON
// If we're targeting carbon, use the CFString conversion to uppercase
+ int len = XMLString::stringLen(toUpperCase);
CFMutableStringRef cfString = CFStringCreateMutableWithExternalCharactersNoCopy(
- NULL,
+ kCFAllocatorDefault,
(UniChar*)toUpperCase,
- XMLString::stringLen(toUpperCase),
- 0,
+ len, // length
+ len, // capacity
kCFAllocatorNull);
CFStringUppercase(cfString, NULL);
CFRelease(cfString);
@@ -491,11 +492,12 @@
#if TARGET_API_MAC_CARBON
// If we're targeting carbon, use the CFString conversion to uppercase
+ int len = XMLString::stringLen(toLowerCase);
CFMutableStringRef cfString = CFStringCreateMutableWithExternalCharactersNoCopy(
- NULL,
+ kCFAllocatorDefault,
(UniChar*)toLowerCase,
- XMLString::stringLen(toLowerCase),
- 0,
+ len, // length
+ len, // capacity
kCFAllocatorNull);
CFStringLowercase(cfString, NULL);
CFRelease(cfString);
1.5 +2 -2
xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
Index: MacOSUnicodeConverter.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MacOSUnicodeConverter.hpp 4 Nov 2002 15:14:34 -0000 1.4
+++ MacOSUnicodeConverter.hpp 13 Nov 2002 17:37:36 -0000 1.5
@@ -61,8 +61,8 @@
#ifndef MACOSUNICODECONVERTER_HPP
#define MACOSUNICODECONVERTER_HPP
-#include <xercesc/util/TransService.hpp>
#include <cstddef>
+#include <xercesc/util/TransService.hpp>
#if defined(__APPLE__)
// Framework includes from ProjectBuilder
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
