[Gmp-commit] /var/hg/gmp: Minor testsuite fixes when building as C++.

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/2ef82c5b01b5
changeset: 16534:2ef82c5b01b5
user:      Marc Glisse <marc.glisse at inria.fr>
date:      Mon Dec 08 21:18:03 2014 +0100
description:
Minor testsuite fixes when building as C++.

diffstat:

 ChangeLog             |  5 +++++
 tests/misc/t-locale.c |  6 ++++++
 tests/mpf/t-get_si.c  |  2 +-
 3 files changed, 12 insertions(+), 1 deletions(-)

diffs (50 lines):

diff -r 60d1caaee672 -r 2ef82c5b01b5 ChangeLog
--- a/ChangeLog	Mon Dec 08 20:19:37 2014 +0100
+++ b/ChangeLog	Mon Dec 08 21:18:03 2014 +0100
@@ -7,6 +7,11 @@
 	* longlong.h (sparc64): Define COUNT_LEADING_ZEROS_NEED_CLZ_TAB
 	with VIS3.
 
+	* tests/misc/t-locale.c (localeconv, nl_langinfo): Match glibc's
+	prototype in C++.
+	* tests/mpf/t-get_si.c (check_limbdata): Avoid narrowing conversion
+	from -1 to unsigned inside {}.
+
 2014-12-02  Torbjörn Granlund  <torbjorng at google.com>
 
 	* config.guess (arm*-*-*): Redirect stderr.
diff -r 60d1caaee672 -r 2ef82c5b01b5 tests/misc/t-locale.c
--- a/tests/misc/t-locale.c	Mon Dec 08 20:19:37 2014 +0100
+++ b/tests/misc/t-locale.c	Mon Dec 08 21:18:03 2014 +0100
@@ -55,6 +55,9 @@
 #if HAVE_LOCALECONV
 struct lconv *
 localeconv (void)
+#if defined __cplusplus && defined __GLIBC__
+  throw()
+#endif
 {
   static struct lconv  l;
   l.decimal_point = (char *) decimal_point;
@@ -66,6 +69,9 @@
 #if HAVE_NL_LANGINFO
 char *
 nl_langinfo (nl_item n)
+#if defined __cplusplus && defined __GLIBC__
+  throw()
+#endif
 {
 #if defined (DECIMAL_POINT)
   if (n == DECIMAL_POINT)
diff -r 60d1caaee672 -r 2ef82c5b01b5 tests/mpf/t-get_si.c
--- a/tests/mpf/t-get_si.c	Mon Dec 08 20:19:37 2014 +0100
+++ b/tests/mpf/t-get_si.c	Mon Dec 08 21:18:03 2014 +0100
@@ -136,7 +136,7 @@
     { 0, 0, { 0 }, 0L },    /* 0 */
 
     { 1,  1, { 1 }, 1L },   /* 1 */
-    { 1, -1, { 1 }, -1L },  /* -1 */
+    { 1, -1, { 1 }, -1UL },  /* -1 */
 
     { 0,  1, { 1 }, 0L },   /* .1 */
     { 0, -1, { 1 }, 0L },   /* -.1 */