Merge recursive expressions performance update from Trunk.

Merge Makefile update from Trunk.
Merge history update.

[SVN r58542]
This commit is contained in:
John Maddock
2009-12-28 13:07:04 +00:00
parent ae79f29895
commit e41acbc33f
47 changed files with 3593 additions and 3511 deletions

View File

@ -84,7 +84,7 @@ inline bool is_combining<unsigned char>(unsigned char)
{
return false;
}
#ifndef __hpux // can't use WCHAR_MAX/MIN in pp-directives
#if !defined(__hpux) && !defined(__WINSCW__) // can't use WCHAR_MAX/MIN in pp-directives
#ifdef _MSC_VER
template<>
inline bool is_combining<wchar_t>(wchar_t c)