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

219N/A+++ cxx/osmpf.cc 2008-04-18 10:08:31.565184503 -0700

219N/A@@ -19,15 +19,14 @@

219N/A

219N/A #include <clocale>

219N/A #include <iostream>

219N/A+using namespace std;

219N/A+

219N/A #include <stdarg.h> /* for va_list and hence doprnt_funs_t */

219N/A #include <string.h>

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 /* The gmp_asprintf support routines never give an error, so

219N/A __gmp_doprnt_mpf shouldn't fail and it's return can just be checked with

219N/A an ASSERT. */

219N/A@@ -44,7 +43,14 @@

219N/A

219N/A #if HAVE_STD__LOCALE

219N/A char point[2];

219N/A- point[0] = use_facet< numpunct<char> >(o.getloc()).decimal_point();

219N/A+ point[0] =

219N/A+#ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE

219N/A+ use_facet< numpunct<char> >(o.getloc())

219N/A+#else

219N/A+ use_facet(o.getloc(),(numpunct<char>*)0)

219N/A+#endif

219N/A+ .decimal_point();

219N/A+

219N/A point[1] = '\0';

219N/A #else

219N/A const char *point = localeconv()->decimal_point;