Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gnump/patches/008-ismpz.cc.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 219 22d9e175d379
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
219
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- cxx/ismpz.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/ismpz.cc	2008-04-18 10:06:50.866243982 -0700
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -20,11 +20,11 @@
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
 #include <cctype>
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
 #include <iostream>
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
 #include <string>
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
-#include "gmp.h"
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
-#include "gmp-impl.h"
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
-
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
+#include <clocale>
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
 using namespace std;
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+#include "gmp.h"
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
+#include "gmp-impl.h"
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
 // For g++ libstdc++ parsing see num_get<chartype,initer>::_M_extract_int in
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
 // include/bits/locale_facets.tcc.
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
@@ -38,7 +38,12 @@
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
   if (i.flags() & ios::skipws) // skip initial whitespace
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
     {
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
 #if HAVE_STD__LOCALE
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
-      const ctype<char>& ct = use_facet< ctype<char> >(i.getloc());
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
+      const ctype<char>& ct =
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
+#ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
+	use_facet< ctype<char> >(i.getloc());
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
+#else
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
+	use_facet(i.getloc(),(ctype<char>*)0);
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
+#endif
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
 #define cxx_isspace(c)  (ct.is(ctype_base::space,(c)))
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
 #else
22d9e175d379 7041521 GNU MP to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
 #define cxx_isspace(c)  isspace(c)
upstream/oracle/userland-gate