added #ifndef ARABICA_NO_WCHAR_T around typedefs using wchar_t or std::wstring

This commit is contained in:
jez_higgins 2003-09-08 14:14:43 +00:00
parent 30e448ee5a
commit 9329ac47ca
26 changed files with 52 additions and 0 deletions

View file

@ -183,7 +183,9 @@ public:
}; // class AttributeList }; // class AttributeList
typedef basic_AttributeList<std::string> AttributeList; typedef basic_AttributeList<std::string> AttributeList;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_AttributeList<std::wstring> wAttributeList; typedef basic_AttributeList<std::wstring> wAttributeList;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -224,7 +224,9 @@ public:
}; // class Attributes }; // class Attributes
typedef basic_Attributes<std::string> Attributes; typedef basic_Attributes<std::string> Attributes;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_Attributes<std::wstring> wAttributes; typedef basic_Attributes<std::wstring> wAttributes;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -331,7 +331,9 @@ public:
}; // class basic_ContentHandler }; // class basic_ContentHandler
typedef basic_ContentHandler<std::string> ContentHandler; typedef basic_ContentHandler<std::string> ContentHandler;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_ContentHandler<std::wstring> wContentHandler; typedef basic_ContentHandler<std::wstring> wContentHandler;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -118,7 +118,9 @@ public:
}; // class basic_DTDHandler }; // class basic_DTDHandler
typedef basic_DTDHandler<std::string> DTDHandler; typedef basic_DTDHandler<std::string> DTDHandler;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_DTDHandler<std::wstring> wDTDHandler; typedef basic_DTDHandler<std::wstring> wDTDHandler;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -66,7 +66,9 @@ public:
}; // class basic_DocumentHandler }; // class basic_DocumentHandler
typedef basic_DocumentHandler<std::string> DocumentHandler; typedef basic_DocumentHandler<std::string> DocumentHandler;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_DocumentHandler<std::wstring> wDocumentHandler; typedef basic_DocumentHandler<std::wstring> wDocumentHandler;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -107,7 +107,9 @@ public:
}; // class EntityResolver }; // class EntityResolver
typedef basic_EntityResolver<std::string> EntityResolver; typedef basic_EntityResolver<std::string> EntityResolver;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_EntityResolver<std::wstring> wEntityResolver; typedef basic_EntityResolver<std::wstring> wEntityResolver;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -113,7 +113,9 @@ public:
}; // class ErrorHandler }; // class ErrorHandler
typedef basic_ErrorHandler<std::string> ErrorHandler; typedef basic_ErrorHandler<std::string> ErrorHandler;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_ErrorHandler<std::wstring> wErrorHandler; typedef basic_ErrorHandler<std::wstring> wErrorHandler;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -280,7 +280,9 @@ public:
}; // class HandlerBase }; // class HandlerBase
typedef basic_HandlerBase<std::string> HandlerBase; typedef basic_HandlerBase<std::string> HandlerBase;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_HandlerBase<std::wstring> wHandlerBase; typedef basic_HandlerBase<std::wstring> wHandlerBase;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -302,7 +302,9 @@ void basic_InputSource<charT, traitsT, allocatorT>::setCharacterStream(charStrea
typedef basic_InputSource<std::string> InputSource; typedef basic_InputSource<std::string> InputSource;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_InputSource<std::wstring> wInputSource; typedef basic_InputSource<std::wstring> wInputSource;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -121,7 +121,9 @@ public:
}; // class Locator }; // class Locator
typedef basic_Locator<std::string> Locator; typedef basic_Locator<std::string> Locator;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_Locator<std::wstring> wLocator; typedef basic_Locator<std::wstring> wLocator;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -154,7 +154,9 @@ public:
}; // class basic_Parser }; // class basic_Parser
typedef basic_Parser<std::string> Parser; typedef basic_Parser<std::string> Parser;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_Parser<std::wstring> wParser; typedef basic_Parser<std::wstring> wParser;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -163,7 +163,9 @@ private:
}; // class basic_SAXParseException }; // class basic_SAXParseException
typedef basic_SAXParseException<std::string> SAXParseException; typedef basic_SAXParseException<std::string> SAXParseException;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_SAXParseException<std::wstring> wSAXParseException; typedef basic_SAXParseException<std::wstring> wSAXParseException;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -62,7 +62,9 @@ public:
}; // class basic_XMLFilter }; // class basic_XMLFilter
typedef basic_XMLFilter<std::string> XMLFilter; typedef basic_XMLFilter<std::string> XMLFilter;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_XMLFilter<std::wstring> wXMLFilter; typedef basic_XMLFilter<std::wstring> wXMLFilter;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -70,7 +70,9 @@ public:
}; // class basic_Attributes2 }; // class basic_Attributes2
typedef basic_Attributes2<std::string> Attributes2; typedef basic_Attributes2<std::string> Attributes2;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_Attributes2<std::wstring> wAttributes2; typedef basic_Attributes2<std::wstring> wAttributes2;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -126,7 +126,9 @@ public:
}; // class basic_DeclHandler }; // class basic_DeclHandler
typedef basic_DeclHandler<std::string> DeclHandler; typedef basic_DeclHandler<std::string> DeclHandler;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_DeclHandler<std::wstring> wDeclHandler; typedef basic_DeclHandler<std::wstring> wDeclHandler;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -268,7 +268,9 @@ private:
}; // class basic_DefaultHandler }; // class basic_DefaultHandler
typedef basic_DefaultHandler2<std::string> DefaultHandler2; typedef basic_DefaultHandler2<std::string> DefaultHandler2;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_DefaultHandler2<std::wstring> wDefaultHandler2; typedef basic_DefaultHandler2<std::wstring> wDefaultHandler2;
#endif
} // namespace SAX } // namespace SAX

View file

@ -186,7 +186,9 @@ public:
}; // class basic_LexicalHandler }; // class basic_LexicalHandler
typedef basic_LexicalHandler<std::string> LexicalHandler; typedef basic_LexicalHandler<std::string> LexicalHandler;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_LexicalHandler<std::wstring> wLexicalHandler; typedef basic_LexicalHandler<std::wstring> wLexicalHandler;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -65,7 +65,9 @@ public:
}; // class basic_Locator2 }; // class basic_Locator2
typedef basic_Locator2<std::string> Locator2; typedef basic_Locator2<std::string> Locator2;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_Locator2<std::wstring> wLocator2; typedef basic_Locator2<std::wstring> wLocator2;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -453,7 +453,9 @@ void basic_Writer<string_type>::comment(const stringT& text)
} // comment } // comment
typedef basic_Writer<std::string> Writer; typedef basic_Writer<std::string> Writer;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_Writer<std::wstring> wWriter; typedef basic_Writer<std::wstring> wWriter;
#endif
} // namespace SAX } // namespace SAX

View file

@ -288,7 +288,9 @@ private:
}; // class AttributeListImpl }; // class AttributeListImpl
typedef basic_AttributeListImpl<std::string> AttributeListImpl; typedef basic_AttributeListImpl<std::string> AttributeListImpl;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_AttributeListImpl<std::wstring> wAttributeListImpl; typedef basic_AttributeListImpl<std::wstring> wAttributeListImpl;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -521,7 +521,9 @@ public:
}; // class AttributesImpl }; // class AttributesImpl
typedef basic_AttributesImpl<std::string> AttributesImpl; typedef basic_AttributesImpl<std::string> AttributesImpl;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_AttributesImpl<std::wstring> wAttributesImpl; typedef basic_AttributesImpl<std::wstring> wAttributesImpl;
#endif
} // namespace SAX } // namespace SAX

View file

@ -369,7 +369,9 @@ private:
}; // class basic_DefaultHandler }; // class basic_DefaultHandler
typedef basic_DefaultHandler<std::string> DefaultHandler; typedef basic_DefaultHandler<std::string> DefaultHandler;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_DefaultHandler<std::wstring> wDefaultHandler; typedef basic_DefaultHandler<std::wstring> wDefaultHandler;
#endif
} // namespace SAX } // namespace SAX

View file

@ -160,7 +160,9 @@ private:
}; // class LocatorImpl }; // class LocatorImpl
typedef basic_LocatorImpl<std::string> LocatorImpl; typedef basic_LocatorImpl<std::string> LocatorImpl;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_LocatorImpl<std::wstring> wLocatorImpl; typedef basic_LocatorImpl<std::wstring> wLocatorImpl;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -542,7 +542,9 @@ private:
}; // ParserAdaptor }; // ParserAdaptor
typedef basic_ParserAdaptor<std::string, char> ParserAdaptor; typedef basic_ParserAdaptor<std::string, char> ParserAdaptor;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_ParserAdaptor<std::wstring, wchar_t> wParserAdaptor; typedef basic_ParserAdaptor<std::wstring, wchar_t> wParserAdaptor;
#endif
} // namespace SAX } // namespace SAX

View file

@ -500,7 +500,9 @@ private:
}; // class basic_XMLFilter }; // class basic_XMLFilter
typedef basic_XMLFilterImpl<std::string> XMLFilterImpl; typedef basic_XMLFilterImpl<std::string> XMLFilterImpl;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_XMLFilterImpl<std::wstring> wXMLFilterImpl; typedef basic_XMLFilterImpl<std::wstring> wXMLFilterImpl;
#endif
}; // namespace SAX }; // namespace SAX

View file

@ -88,6 +88,7 @@ typedef basic_Locator<std::string> Locator;
typedef basic_Parser<std::string> Parser; typedef basic_Parser<std::string> Parser;
typedef basic_SAXParseException<std::string> SAXParseException; typedef basic_SAXParseException<std::string> SAXParseException;
#ifndef ARABICA_NO_WCHAR_T
typedef basic_AttributeList<std::wstring> wAttributeList; typedef basic_AttributeList<std::wstring> wAttributeList;
typedef basic_DocumentHandler<std::wstring> wDocumentHandler; typedef basic_DocumentHandler<std::wstring> wDocumentHandler;
typedef basic_DTDHandler<std::wstring> wDTDHandler; typedef basic_DTDHandler<std::wstring> wDTDHandler;
@ -96,6 +97,7 @@ typedef basic_InputSource<std::wstring> wInputSource;
typedef basic_Locator<std::wstring> wLocator; typedef basic_Locator<std::wstring> wLocator;
typedef basic_Parser<std::wstring> wParser; typedef basic_Parser<std::wstring> wParser;
typedef basic_SAXParseException<std::wstring> wSAXParseException; typedef basic_SAXParseException<std::wstring> wSAXParseException;
#endif
}; // namespace SAX }; // namespace SAX