diff -r 71065c81b5a2 src/ov-base.h --- a/src/ov-base.h Sat Feb 23 21:12:37 2008 +0200 +++ b/src/ov-base.h Sun Feb 24 18:38:58 2008 +0100 @@ -505,6 +505,9 @@ virtual octave_value tanh (void) const; virtual octave_value isalnum (void) const; virtual octave_value isalpha (void) const; +#ifdef isascii +#undef isascii +#endif virtual octave_value isascii (void) const; virtual octave_value iscntrl (void) const; virtual octave_value isdigit (void) const; @@ -515,6 +518,9 @@ virtual octave_value isspace (void) const; virtual octave_value isupper (void) const; virtual octave_value isxdigit (void) const; +#ifdef toascii +#undef toascii +#endif virtual octave_value toascii (void) const; virtual octave_value tolower (void) const; virtual octave_value toupper (void) const; diff -r 71065c81b5a2 src/ov-str-mat.cc --- a/src/ov-str-mat.cc Sat Feb 23 21:12:37 2008 +0200 +++ b/src/ov-str-mat.cc Sun Feb 24 18:38:58 2008 +0100 @@ -797,7 +797,13 @@ STRING_MAPPER (isalnum, bmap, isalnum) STRING_MAPPER (isalpha, bmap, isalpha) +#ifdef _MSC_VER +STRING_MAPPER (isascii, bmap, __isascii) +STRING_MAPPER (toascii, dmap, __toascii) +#else STRING_MAPPER (isascii, bmap, isascii) +STRING_MAPPER (toascii, dmap, toascii) +#endif STRING_MAPPER (iscntrl, bmap, iscntrl) STRING_MAPPER (isdigit, bmap, isdigit) STRING_MAPPER (isgraph, bmap, isgraph) @@ -807,7 +813,6 @@ STRING_MAPPER (isspace, bmap, isspace) STRING_MAPPER (isupper, bmap, isupper) STRING_MAPPER (isxdigit, bmap, isxdigit) -STRING_MAPPER (toascii, dmap, toascii) TOSTRING_MAPPER (tolower, smap, tolower) TOSTRING_MAPPER (toupper, smap, toupper) diff -r 71065c81b5a2 src/ov.h --- a/src/ov.h Sat Feb 23 21:12:37 2008 +0200 +++ b/src/ov.h Sun Feb 24 18:38:58 2008 +0100 @@ -880,6 +880,14 @@ #define MAPPER_FORWARD(F) \ octave_value F (void) const { return rep->F (); } +#ifdef isascii +#undef isascii +#endif + +#ifdef toascii +#undef toascii +#endif + MAPPER_FORWARD (abs) MAPPER_FORWARD (acos) MAPPER_FORWARD (acosh)