R16: Xcode UniString changes
R16: Xcode UniString changes
- Subject: R16: Xcode UniString changes
- From: "Steve Graesser" <email@hidden>
- Date: Fri, 17 Sep 2004 10:09:03 -0600
- Delivered-to: email@hidden
- Delivered-to: email@hidden
- Organization: White Lab Consulting
Hi All,
I have been updating the Xcode project files to work with Xcode 1.1. I
have updated the UniString classes to work with the latest GCC compiler.
The relevant code changes are included below.
Steve
Index: macapp.16/ACS/Suites/text/CUniString_AC.cpp
===================================================================
RCS file: /home1/frmwrks/clubmacapp/cvs/macapp.16/ACS/Suites/text/
CUniString_AC.cpp,v
retrieving revision 1.3
diff -r1.3 CUniString_AC.cpp
11a12
> 09/03/04 SPG Commented out UNISTR tests which don't work for Xcode
builds.
1425a1427,1432
> #if qCarbonMach0
> // Don't use the UNISTR macro on Mach0 build because it will create
UTF32 strings
> // which are not compatible with UniChar strings which take UTF16
characters.
> const UniChar helloU[] = { 'H', 'e', 'l', 'l', 'o', ',', ' ',
> 'C', 'U', 'n', 'i', 'S', 't', 'r', 'i', 'n', 'g', '_', 'A',
'C', '!' };
> #else
1426a1434
> #endif
1439a1448
> #if !qXcode
1440a1450
> #endif
Index: macapp.16/ACS/Suites/text/CUniString_AC.h
===================================================================
RCS file: /home1/frmwrks/clubmacapp/cvs/macapp.16/ACS/Suites/text/
CUniString_AC.h,v
retrieving revision 1.1
diff -r1.1 CUniString_AC.h
11a12
> 09/01/04 SPG Removed qHasStdIterator define as Xcode supports std
iterator.
70,79c71,72
< #ifndef qHasStdIterator
< #ifndef __GNUC__
< #define qHasStdIterator 1
< #else
< #ifdef __STL_USE_NAMESPACES
< #define qHasStdIterator 1
< #else
< #define qHasStdIterator 0
< #endif
< #endif
---
> #if qXcode
> #include "UniCharString.h"
116d108
< #if qHasStdIterator
118,120d109
< #else
< class u_iterator : public std::ran
dom_access_iterator<UnicodeScalarValue, ptrdiff_t>
< #endif
164d152
< #if qHasStdIterator
166,168d153
< #else
< class u_const_iterator : public std:
:random_access_iterator<UnicodeScalarValue, ptrdiff_t>
< #endif
Index: macapp.16/ACS/Suites/ICU/pmacos.h
===================================================================
RCS file: /home1/frmwrks/clubmacapp/cvs/macapp.16/ACS/Suites/ICU/pmacos.h,v
retrieving revision 1.2
diff -r1.2 pmacos.h
20a21
> * 09/02/04 Steve G Changed TARGET_RT_MAC_MACHO define for
Xcode builds.
44c45
< #if TARGET_RT_MAC_MACHO
---
> #if defined(__MWERKS__) || defined(__GNUC__)
131c132,136
< #if TARGET_RT_MAC_MACHO
---
> #if defined(__GNUC__)
> #define U_SIZEOF_WCHAR_T 4
> #define U_HAVE_WCHAR_H 1
> #define U_HAVE_WCSCPY 1
> #elif defined(__MWERKS__)
Index: macapp.16/ACS/Suites/ICU/umachine.h
===================================================================
RCS file: /home1/frmwrks/clubmacapp/cvs/macapp.16/ACS/Suites/ICU/umachine.h,v
retrieving revision 1.1
diff -r1.1 umachine.h
25c25
< * 12/01/03 Tom Becker Regularize include guards. Remove "unicode/
" from
---
> * 12/01/03 Tom Becker Regularize include guards. Remove "unicode/
" from
26a27
> * 09/02/04 Steve G Xcode build support.
55c56
< #elif defined(__MWERKS__)
---
> #elif defined(__MWERKS__) || defined(__GNUC__)
Index: macapp.16/ACS/Suites/text/UniStringUtils.h
===================================================================
RCS file: /home1/frmwrks/clubmacapp/cvs/macapp.16/ACS/Suites/text/
UniStringUtils.h,v
retrieving revision 1.1
diff -r1.1 UniStringUtils.h
11a12
> 09/01/04 SPG Changed wiostream include to iostream for Xcode builds.
39c40
< #include <wiostream>
---
> #include <iostream>
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Macapp-dev mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden
Visit the Apple Store online or at retail locations.
1-800-MY-APPLE
Contact Apple | Terms of Use | Privacy Policy
Copyright © 2011 Apple Inc. All rights reserved.
