author | Yiteng Zhang <yiteng.zhang@oracle.com> |
Tue, 04 Oct 2016 11:04:14 -0700 | |
branch | s11u3-sru |
changeset 7033 | a49f9f0272f2 |
parent 219 | 22d9e175d379 |
permissions | -rw-r--r-- |
219
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
--- cxx/osmpf.cc.orig 2007-09-01 03:09:03.000000000 -0700 |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
+++ cxx/osmpf.cc 2008-04-18 10:08:31.565184503 -0700 |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
@@ -19,15 +19,14 @@ |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
|
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
#include <clocale> |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
#include <iostream> |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
+using namespace std; |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
+ |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
#include <stdarg.h> /* for va_list and hence doprnt_funs_t */ |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
#include <string.h> |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
|
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
#include "gmp.h" |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
#include "gmp-impl.h" |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
|
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
-using namespace std; |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
- |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
- |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
/* The gmp_asprintf support routines never give an error, so |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
__gmp_doprnt_mpf shouldn't fail and it's return can just be checked with |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
an ASSERT. */ |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
@@ -44,7 +43,14 @@ |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
|
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
#if HAVE_STD__LOCALE |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
char point[2]; |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
- point[0] = use_facet< numpunct<char> >(o.getloc()).decimal_point(); |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
+ point[0] = |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
+#ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
+ use_facet< numpunct<char> >(o.getloc()) |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
+#else |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
+ use_facet(o.getloc(),(numpunct<char>*)0) |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
31 |
+#endif |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
32 |
+ .decimal_point(); |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
33 |
+ |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
34 |
point[1] = '\0'; |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
35 |
#else |
22d9e175d379
7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
36 |
const char *point = localeconv()->decimal_point; |