From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Thu, 2 Aug 2018 09:04:43 +0000 (+0200)
Subject: Use common type in AssertIndexRange for the comparison
X-Git-Tag: v9.1.0-rc1~857^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7019%2Fhead;p=dealii.git

Use common type in AssertIndexRange for the comparison
---

diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h
index 6ff4068d00..9f01ac2012 100644
--- a/include/deal.II/base/exceptions.h
+++ b/include/deal.II/base/exceptions.h
@@ -1402,11 +1402,16 @@ namespace internal
  * fails.
  *
  * @ingroup Exceptions
- * @author Guido Kanschat 2007
+ * @author Guido Kanschat, Daniel Arndt, 2007, 2018
  */
 #define AssertIndexRange(index, range)                                         \
   Assert(                                                                      \
-    (index) < (range),                                                         \
+    static_cast<typename ::dealii::internal::argument_type<void(               \
+        typename std::common_type<decltype(index), decltype(range)>::type)>::  \
+                  type>(index) <                                               \
+      static_cast<typename ::dealii::internal::argument_type<void(             \
+        typename std::common_type<decltype(index), decltype(range)>::type)>::  \
+                    type>(range),                                              \
     dealii::ExcIndexRangeType<typename ::dealii::internal::argument_type<void( \
       typename std::common_type<decltype(index), decltype(range)>::type)>::    \
                                 type>((index), 0, (range)))