From 6bbf986bc3ecd457e3c6b4cbde6231f744a38648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Fri, 29 Aug 2014 11:39:25 +0200
Subject: [PATCH] Reduce number of warnings.
nullptr-test.cc: Move semicolon to own line to prevent
Clang warning.
typetraitstest.cc: Exclude use of deprecated types
PointeeType and ReferredType with
DISABLE_DEPRECATED_METHOD_CHECKS defined.
---
dune/common/test/nullptr-test.cc | 24 ++++++++++++++++--------
dune/common/test/typetraitstest.cc | 2 ++
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/dune/common/test/nullptr-test.cc b/dune/common/test/nullptr-test.cc
index 879a00721..92e9f41cf 100644
--- a/dune/common/test/nullptr-test.cc
+++ b/dune/common/test/nullptr-test.cc
@@ -16,16 +16,24 @@ void basic_tests()
++n;
#endif
int n2 = 0; // n2 is zero
- if( ch == 0 ) ; // evaluates to true
- if( ch == nullptr ) ; // evaluates to true
- if( nullptr == ch ) ; // evaluates to true
- if( ch ) ; // evaluates to false
- if( n2 == 0 ) ; // evaluates to true
+ if( ch == 0 ) // evaluates to true
+ ;
+ if( ch == nullptr ) // evaluates to true
+ ;
+ if( nullptr == ch ) // evaluates to true
+ ;
+ if( ch ) // evaluates to false
+ ;
+ if( n2 == 0 ) // evaluates to true
+ ;
ch = ch2;
#ifdef FAIL
- if( n2 == nullptr ) ; // error
- if( nullptr ) ; // error, no conversion to bool
- if( nullptr == 0 ) ; // error
+ if( n2 == nullptr ) // error
+ ;
+ if( nullptr ) // error, no conversion to bool
+ ;
+ if( nullptr == 0 ) // error
+ ;
// arithmetic
nullptr = 0; // error, nullptr is not an lvalue
nullptr + 2; // error
diff --git a/dune/common/test/typetraitstest.cc b/dune/common/test/typetraitstest.cc
index f344cb26a..760664d99 100644
--- a/dune/common/test/typetraitstest.cc
+++ b/dune/common/test/typetraitstest.cc
@@ -26,6 +26,7 @@ int main() {
assert( Dune::TypeTraits<int&>::isReference );
assert( not Dune::TypeTraits<int&&>::isReference );
+#ifndef DISABLE_DEPRECATED_METHOD_CHECKS
// Test TypeTraits::PointeeType
assert( (Dune::is_same<Dune::Empty, Dune::TypeTraits<int>::PointeeType>::value) );
assert( (Dune::is_same<int, Dune::TypeTraits<int*>::PointeeType>::value) );
@@ -36,6 +37,7 @@ int main() {
// Test TypeTraits::ReferredType
assert( (Dune::is_same<int, Dune::TypeTraits<int>::ReferredType>::value) );
assert( (Dune::is_same<int, Dune::TypeTraits<int&>::ReferredType>::value) );
+#endif // DISABLE_DEPRECATED_METHOD_CHECKS
// Test is_pointer
assert( not Dune::is_pointer<int>::value );
--
GitLab