From 9329ac47ca1d1c0a9a4360d751e08bb0931a6380 Mon Sep 17 00:00:00 2001 From: jez_higgins <> Date: Mon, 8 Sep 2003 14:14:43 +0000 Subject: [PATCH] added #ifndef ARABICA_NO_WCHAR_T around typedefs using wchar_t or std::wstring --- SAX/AttributeList.h | 2 ++ SAX/Attributes.h | 2 ++ SAX/ContentHandler.h | 2 ++ SAX/DTDHandler.h | 2 ++ SAX/DocumentHandler.h | 2 ++ SAX/EntityResolver.h | 2 ++ SAX/ErrorHandler.h | 2 ++ SAX/HandlerBase.h | 2 ++ SAX/InputSource.h | 2 ++ SAX/Locator.h | 2 ++ SAX/Parser.h | 2 ++ SAX/SAXParseException.h | 2 ++ SAX/XMLFilter.h | 2 ++ SAX/ext/Attributes2.h | 2 ++ SAX/ext/DeclHandler.h | 2 ++ SAX/ext/DefaultHandler2.h | 2 ++ SAX/ext/LexicalHandler.h | 2 ++ SAX/ext/Locator2.h | 2 ++ SAX/filter/Writer.h | 2 ++ SAX/helpers/AttributeListImpl.h | 2 ++ SAX/helpers/AttributesImpl.h | 2 ++ SAX/helpers/DefaultHandler.h | 2 ++ SAX/helpers/LocatorImpl.h | 2 ++ SAX/helpers/ParserAdaptor.h | 2 ++ SAX/helpers/XMLFilterImpl.h | 2 ++ SAX/saxfwd.h | 2 ++ 26 files changed, 52 insertions(+) diff --git a/SAX/AttributeList.h b/SAX/AttributeList.h index 2d34db4d..662c8123 100644 --- a/SAX/AttributeList.h +++ b/SAX/AttributeList.h @@ -183,7 +183,9 @@ public: }; // class AttributeList typedef basic_AttributeList AttributeList; +#ifndef ARABICA_NO_WCHAR_T typedef basic_AttributeList wAttributeList; +#endif }; // namespace SAX diff --git a/SAX/Attributes.h b/SAX/Attributes.h index 63322174..9d1b3d14 100644 --- a/SAX/Attributes.h +++ b/SAX/Attributes.h @@ -224,7 +224,9 @@ public: }; // class Attributes typedef basic_Attributes Attributes; +#ifndef ARABICA_NO_WCHAR_T typedef basic_Attributes wAttributes; +#endif }; // namespace SAX diff --git a/SAX/ContentHandler.h b/SAX/ContentHandler.h index e8df1863..98659e4a 100644 --- a/SAX/ContentHandler.h +++ b/SAX/ContentHandler.h @@ -331,7 +331,9 @@ public: }; // class basic_ContentHandler typedef basic_ContentHandler ContentHandler; +#ifndef ARABICA_NO_WCHAR_T typedef basic_ContentHandler wContentHandler; +#endif }; // namespace SAX diff --git a/SAX/DTDHandler.h b/SAX/DTDHandler.h index 6fc8009f..4a1033af 100644 --- a/SAX/DTDHandler.h +++ b/SAX/DTDHandler.h @@ -118,7 +118,9 @@ public: }; // class basic_DTDHandler typedef basic_DTDHandler DTDHandler; +#ifndef ARABICA_NO_WCHAR_T typedef basic_DTDHandler wDTDHandler; +#endif }; // namespace SAX diff --git a/SAX/DocumentHandler.h b/SAX/DocumentHandler.h index f026ff7d..54ba8099 100644 --- a/SAX/DocumentHandler.h +++ b/SAX/DocumentHandler.h @@ -66,7 +66,9 @@ public: }; // class basic_DocumentHandler typedef basic_DocumentHandler DocumentHandler; +#ifndef ARABICA_NO_WCHAR_T typedef basic_DocumentHandler wDocumentHandler; +#endif }; // namespace SAX diff --git a/SAX/EntityResolver.h b/SAX/EntityResolver.h index bad62566..45fab00f 100644 --- a/SAX/EntityResolver.h +++ b/SAX/EntityResolver.h @@ -107,7 +107,9 @@ public: }; // class EntityResolver typedef basic_EntityResolver EntityResolver; +#ifndef ARABICA_NO_WCHAR_T typedef basic_EntityResolver wEntityResolver; +#endif }; // namespace SAX diff --git a/SAX/ErrorHandler.h b/SAX/ErrorHandler.h index cfbb9b5a..f2e4f653 100644 --- a/SAX/ErrorHandler.h +++ b/SAX/ErrorHandler.h @@ -113,7 +113,9 @@ public: }; // class ErrorHandler typedef basic_ErrorHandler ErrorHandler; +#ifndef ARABICA_NO_WCHAR_T typedef basic_ErrorHandler wErrorHandler; +#endif }; // namespace SAX diff --git a/SAX/HandlerBase.h b/SAX/HandlerBase.h index 5b51d673..f9f7fcdb 100644 --- a/SAX/HandlerBase.h +++ b/SAX/HandlerBase.h @@ -280,7 +280,9 @@ public: }; // class HandlerBase typedef basic_HandlerBase HandlerBase; +#ifndef ARABICA_NO_WCHAR_T typedef basic_HandlerBase wHandlerBase; +#endif }; // namespace SAX diff --git a/SAX/InputSource.h b/SAX/InputSource.h index 2c952ed0..21be2b6b 100644 --- a/SAX/InputSource.h +++ b/SAX/InputSource.h @@ -302,7 +302,9 @@ void basic_InputSource::setCharacterStream(charStrea typedef basic_InputSource InputSource; +#ifndef ARABICA_NO_WCHAR_T typedef basic_InputSource wInputSource; +#endif }; // namespace SAX diff --git a/SAX/Locator.h b/SAX/Locator.h index 4c701fbd..392be44b 100644 --- a/SAX/Locator.h +++ b/SAX/Locator.h @@ -121,7 +121,9 @@ public: }; // class Locator typedef basic_Locator Locator; +#ifndef ARABICA_NO_WCHAR_T typedef basic_Locator wLocator; +#endif }; // namespace SAX diff --git a/SAX/Parser.h b/SAX/Parser.h index da5e090a..e34960e3 100644 --- a/SAX/Parser.h +++ b/SAX/Parser.h @@ -154,7 +154,9 @@ public: }; // class basic_Parser typedef basic_Parser Parser; +#ifndef ARABICA_NO_WCHAR_T typedef basic_Parser wParser; +#endif }; // namespace SAX diff --git a/SAX/SAXParseException.h b/SAX/SAXParseException.h index 69a44ae1..30d1ecfb 100644 --- a/SAX/SAXParseException.h +++ b/SAX/SAXParseException.h @@ -163,7 +163,9 @@ private: }; // class basic_SAXParseException typedef basic_SAXParseException SAXParseException; +#ifndef ARABICA_NO_WCHAR_T typedef basic_SAXParseException wSAXParseException; +#endif }; // namespace SAX diff --git a/SAX/XMLFilter.h b/SAX/XMLFilter.h index 2f8617ca..91007fe6 100644 --- a/SAX/XMLFilter.h +++ b/SAX/XMLFilter.h @@ -62,7 +62,9 @@ public: }; // class basic_XMLFilter typedef basic_XMLFilter XMLFilter; +#ifndef ARABICA_NO_WCHAR_T typedef basic_XMLFilter wXMLFilter; +#endif }; // namespace SAX diff --git a/SAX/ext/Attributes2.h b/SAX/ext/Attributes2.h index a1622373..8e87b2f2 100644 --- a/SAX/ext/Attributes2.h +++ b/SAX/ext/Attributes2.h @@ -70,7 +70,9 @@ public: }; // class basic_Attributes2 typedef basic_Attributes2 Attributes2; +#ifndef ARABICA_NO_WCHAR_T typedef basic_Attributes2 wAttributes2; +#endif }; // namespace SAX diff --git a/SAX/ext/DeclHandler.h b/SAX/ext/DeclHandler.h index de431aeb..5d48663f 100644 --- a/SAX/ext/DeclHandler.h +++ b/SAX/ext/DeclHandler.h @@ -126,7 +126,9 @@ public: }; // class basic_DeclHandler typedef basic_DeclHandler DeclHandler; +#ifndef ARABICA_NO_WCHAR_T typedef basic_DeclHandler wDeclHandler; +#endif }; // namespace SAX diff --git a/SAX/ext/DefaultHandler2.h b/SAX/ext/DefaultHandler2.h index 07e1db1b..1a08fc11 100644 --- a/SAX/ext/DefaultHandler2.h +++ b/SAX/ext/DefaultHandler2.h @@ -268,7 +268,9 @@ private: }; // class basic_DefaultHandler typedef basic_DefaultHandler2 DefaultHandler2; +#ifndef ARABICA_NO_WCHAR_T typedef basic_DefaultHandler2 wDefaultHandler2; +#endif } // namespace SAX diff --git a/SAX/ext/LexicalHandler.h b/SAX/ext/LexicalHandler.h index f53c1e3b..4424c591 100644 --- a/SAX/ext/LexicalHandler.h +++ b/SAX/ext/LexicalHandler.h @@ -186,7 +186,9 @@ public: }; // class basic_LexicalHandler typedef basic_LexicalHandler LexicalHandler; +#ifndef ARABICA_NO_WCHAR_T typedef basic_LexicalHandler wLexicalHandler; +#endif }; // namespace SAX diff --git a/SAX/ext/Locator2.h b/SAX/ext/Locator2.h index 7303b4ac..636b5825 100644 --- a/SAX/ext/Locator2.h +++ b/SAX/ext/Locator2.h @@ -65,7 +65,9 @@ public: }; // class basic_Locator2 typedef basic_Locator2 Locator2; +#ifndef ARABICA_NO_WCHAR_T typedef basic_Locator2 wLocator2; +#endif }; // namespace SAX diff --git a/SAX/filter/Writer.h b/SAX/filter/Writer.h index 992f6592..4638e6df 100644 --- a/SAX/filter/Writer.h +++ b/SAX/filter/Writer.h @@ -453,7 +453,9 @@ void basic_Writer::comment(const stringT& text) } // comment typedef basic_Writer Writer; +#ifndef ARABICA_NO_WCHAR_T typedef basic_Writer wWriter; +#endif } // namespace SAX diff --git a/SAX/helpers/AttributeListImpl.h b/SAX/helpers/AttributeListImpl.h index 5c1cbcda..f2d7109e 100644 --- a/SAX/helpers/AttributeListImpl.h +++ b/SAX/helpers/AttributeListImpl.h @@ -288,7 +288,9 @@ private: }; // class AttributeListImpl typedef basic_AttributeListImpl AttributeListImpl; +#ifndef ARABICA_NO_WCHAR_T typedef basic_AttributeListImpl wAttributeListImpl; +#endif }; // namespace SAX diff --git a/SAX/helpers/AttributesImpl.h b/SAX/helpers/AttributesImpl.h index e9239042..79fe098c 100644 --- a/SAX/helpers/AttributesImpl.h +++ b/SAX/helpers/AttributesImpl.h @@ -521,7 +521,9 @@ public: }; // class AttributesImpl typedef basic_AttributesImpl AttributesImpl; +#ifndef ARABICA_NO_WCHAR_T typedef basic_AttributesImpl wAttributesImpl; +#endif } // namespace SAX diff --git a/SAX/helpers/DefaultHandler.h b/SAX/helpers/DefaultHandler.h index fe3ef52d..bda22087 100644 --- a/SAX/helpers/DefaultHandler.h +++ b/SAX/helpers/DefaultHandler.h @@ -369,7 +369,9 @@ private: }; // class basic_DefaultHandler typedef basic_DefaultHandler DefaultHandler; +#ifndef ARABICA_NO_WCHAR_T typedef basic_DefaultHandler wDefaultHandler; +#endif } // namespace SAX diff --git a/SAX/helpers/LocatorImpl.h b/SAX/helpers/LocatorImpl.h index 9ec6b8a0..e99c7ea0 100644 --- a/SAX/helpers/LocatorImpl.h +++ b/SAX/helpers/LocatorImpl.h @@ -160,7 +160,9 @@ private: }; // class LocatorImpl typedef basic_LocatorImpl LocatorImpl; +#ifndef ARABICA_NO_WCHAR_T typedef basic_LocatorImpl wLocatorImpl; +#endif }; // namespace SAX diff --git a/SAX/helpers/ParserAdaptor.h b/SAX/helpers/ParserAdaptor.h index 1db29231..ea5c9241 100644 --- a/SAX/helpers/ParserAdaptor.h +++ b/SAX/helpers/ParserAdaptor.h @@ -542,7 +542,9 @@ private: }; // ParserAdaptor typedef basic_ParserAdaptor ParserAdaptor; +#ifndef ARABICA_NO_WCHAR_T typedef basic_ParserAdaptor wParserAdaptor; +#endif } // namespace SAX diff --git a/SAX/helpers/XMLFilterImpl.h b/SAX/helpers/XMLFilterImpl.h index dab1e554..3a083849 100644 --- a/SAX/helpers/XMLFilterImpl.h +++ b/SAX/helpers/XMLFilterImpl.h @@ -500,7 +500,9 @@ private: }; // class basic_XMLFilter typedef basic_XMLFilterImpl XMLFilterImpl; +#ifndef ARABICA_NO_WCHAR_T typedef basic_XMLFilterImpl wXMLFilterImpl; +#endif }; // namespace SAX diff --git a/SAX/saxfwd.h b/SAX/saxfwd.h index bf2f4059..4c852e3c 100644 --- a/SAX/saxfwd.h +++ b/SAX/saxfwd.h @@ -88,6 +88,7 @@ typedef basic_Locator Locator; typedef basic_Parser Parser; typedef basic_SAXParseException SAXParseException; +#ifndef ARABICA_NO_WCHAR_T typedef basic_AttributeList wAttributeList; typedef basic_DocumentHandler wDocumentHandler; typedef basic_DTDHandler wDTDHandler; @@ -96,6 +97,7 @@ typedef basic_InputSource wInputSource; typedef basic_Locator wLocator; typedef basic_Parser wParser; typedef basic_SAXParseException wSAXParseException; +#endif }; // namespace SAX