From 04e8a79272e660787532cf6ba6f38d1ead0ba15d Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Mon, 10 Dec 2007 16:55:30 +0000
Subject: [PATCH] requirements/non_uint_neg.cc: Avoid -Wall warnings.
2007-12-10 Paolo Carlini <pcarlini@suse.de>
* testsuite/tr1/5_numerical_facilities/random/linear_congruential/
requirements/non_uint_neg.cc: Avoid -Wall warnings.
* testsuite/tr1/5_numerical_facilities/special_functions/
01_assoc_laguerre/compile.cc: Likewise.
* testsuite/util/testsuite_api.h: Likewise.
From-SVN: r130746
---
libstdc++-v3/ChangeLog | 8 +++++++
.../requirements/non_uint_neg.cc | 22 +++++--------------
.../01_assoc_laguerre/compile.cc | 14 +++++-------
libstdc++-v3/testsuite/util/testsuite_api.h | 9 +++-----
4 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ae85dcef2a51..107075155865 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-10 Paolo Carlini <pcarlini@suse.de>
+
+ * testsuite/tr1/5_numerical_facilities/random/linear_congruential/
+ requirements/non_uint_neg.cc: Avoid -Wall warnings.
+ * testsuite/tr1/5_numerical_facilities/special_functions/
+ 01_assoc_laguerre/compile.cc: Likewise.
+ * testsuite/util/testsuite_api.h: Likewise.
+
2007-12-10 Paolo Carlini <pcarlini@suse.de>
* testsuite/25_algorithms/nth_element/2.cc: Avoid -Wall warnings.
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc
index 94d81edc213d..e41fbba48cd2 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc
@@ -1,6 +1,6 @@
// 2006-06-04 Stephen M. Webb <stephen.webb@bregmasoft.com>
//
-// Copyright (C) 2006 Free Software Foundation, Inc.
+// Copyright (C) 2006, 2007 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -20,25 +20,13 @@
// { dg-do compile }
// { dg-options "-D_GLIBCXX_CONCEPT_CHECKS" }
-// { dg-error "not a valid type" "" { target *-*-* } 37 }
-// { dg-error "invalid type" "" { target *-*-* } 37 }
+// { dg-error "not a valid type" "" { target *-*-* } 31 }
+// { dg-error "invalid type" "" { target *-*-* } 31 }
// 5.1.4.1 class template linear_congruential [tr.rand.eng.lcong]
// 5.1.4.1 [4]
#include <tr1/random>
-#include <testsuite_hooks.h>
+
+std::tr1::linear_congruential<double, 48271, 0, 2147483647> x;
-void
-test01()
-{
- using namespace std::tr1;
-
- linear_congruential<double, 48271, 0, 2147483647> x;
-}
-
-int main()
-{
- test01();
- return 0;
-}
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/01_assoc_laguerre/compile.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/01_assoc_laguerre/compile.cc
index 3beffc10ee38..995c5376d1fe 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/01_assoc_laguerre/compile.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/01_assoc_laguerre/compile.cc
@@ -2,7 +2,7 @@
// 2006-02-04 Edward Smith-Rowland <3dw4rd@verizon.net>
//
-// Copyright (C) 2006-2007 Free Software Foundation, Inc.
+// Copyright (C) 2006, 2007 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -27,18 +27,16 @@
void
test01()
{
-
float xf = 0.5F;
double xd = 0.5;
long double xl = 0.5L;
unsigned int n = 2, m = 1;
- float a = std::tr1::assoc_laguerre(n, m, xf);
- float b = std::tr1::assoc_laguerref(n, m, xf);
- double c = std::tr1::assoc_laguerre(n, m, xd);
- long double d = std::tr1::assoc_laguerre(n, m, xl);
- long double e = std::tr1::assoc_laguerrel(n, m, xl);
+ std::tr1::assoc_laguerre(n, m, xf);
+ std::tr1::assoc_laguerref(n, m, xf);
+ std::tr1::assoc_laguerre(n, m, xd);
+ std::tr1::assoc_laguerre(n, m, xl);
+ std::tr1::assoc_laguerrel(n, m, xl);
return;
}
-
diff --git a/libstdc++-v3/testsuite/util/testsuite_api.h b/libstdc++-v3/testsuite/util/testsuite_api.h
index ca0d716bd189..658e2ad168cc 100644
--- a/libstdc++-v3/testsuite/util/testsuite_api.h
+++ b/libstdc++-v3/testsuite/util/testsuite_api.h
@@ -118,20 +118,17 @@ namespace __gnu_test
struct void_function
{
typedef _Result result_type;
-
+
result_type
operator()() const
- {
- result_type r;
- return r;
- }
+ { return result_type(); }
};
template<>
struct void_function<NonDefaultConstructible>
{
typedef NonDefaultConstructible result_type;
-
+
result_type
operator()() const
{ return result_type(2); }
--
GitLab