219N/A--- cxx/ismpf.cc.orig 2007-09-01 03:09:03.000000000 -0700

219N/A+++ cxx/ismpf.cc 2008-04-18 10:10:34.840332673 -0700

219N/A@@ -21,13 +21,11 @@

219N/A #include <iostream>

219N/A #include <string>

219N/A #include <clocale> // for localeconv

219N/A+using namespace std;

219N/A

219N/A #include "gmp.h"

219N/A #include "gmp-impl.h"

219N/A

219N/A-using namespace std;

219N/A-

219N/A-

219N/A // For g++ libstdc++ parsing see num_get<chartype,initer>::_M_extract_float

219N/A // in include/bits/locale_facets.tcc.

219N/A //

219N/A@@ -50,7 +48,13 @@

219N/A // C++ decimal point

219N/A #if HAVE_STD__LOCALE

219N/A const locale& loc = i.getloc();

219N/A- char point_char = use_facet< numpunct<char> >(loc).decimal_point();

219N/A+ char point_char =

219N/A+#ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE

219N/A+ use_facet< numpunct<char> >(loc)

219N/A+#else

219N/A+ use_facet(loc,(numpunct<char>*)0)

219N/A+#endif

219N/A+ .decimal_point();

219N/A #else

219N/A const char *point = lconv_point;

219N/A char point_char = *point;

219N/A@@ -62,7 +66,12 @@

219N/A {

219N/A // C++ isspace

219N/A #if HAVE_STD__LOCALE

219N/A- const ctype<char>& ct = use_facet< ctype<char> >(loc);

219N/A+ const ctype<char>& ct =

219N/A+#ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE

219N/A+ use_facet< ctype<char> >(loc);

219N/A+#else

219N/A+ use_facet(loc,(ctype<char>*)0);

219N/A+#endif

219N/A #define cxx_isspace(c) (ct.is(ctype_base::space,(c)))

219N/A #else

219N/A #define cxx_isspace(c) isspace(c)