From b0704e9bb3d11607dddf02a50ea87450fab74d4d Mon Sep 17 00:00:00 2001
From: Timo Heister <timo.heister@gmail.com>
Date: Sun, 27 Sep 2015 07:14:15 -0400
Subject: [PATCH] compile warnings and errors

---
 include/deal.II/base/symmetric_tensor.h | 9 ++++++++-
 source/base/logstream.cc                | 2 +-
 source/fe/mapping_q_generic.cc          | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h
index f24f57f880..e1de217faf 100644
--- a/include/deal.II/base/symmetric_tensor.h
+++ b/include/deal.II/base/symmetric_tensor.h
@@ -1832,7 +1832,10 @@ namespace internal
               for (unsigned int e=d+1; e<dim; ++e, ++c)
                 if ((sorted_indices[0]==d) && (sorted_indices[1]==e))
                   return dim+c;
-            Assert (false, ExcNotImplemented());
+
+            // should never get here:
+            AssertThrow(false, ExcInternalError());
+            return 0;
           }
           }
       }
@@ -1931,6 +1934,10 @@ namespace internal
               for (unsigned int e=d+1; e<dim; ++e, ++c)
                 if (c==i)
                   return TableIndices<2>(d,e);
+
+            // should never get here:
+            AssertThrow(false, ExcInternalError());
+            return TableIndices<2>(0, 0);
           }
       }
 
diff --git a/source/base/logstream.cc b/source/base/logstream.cc
index abd73a851f..a12bed485e 100644
--- a/source/base/logstream.cc
+++ b/source/base/logstream.cc
@@ -115,7 +115,7 @@ LogStream::test_mode(bool on)
   if (on)
     {
       double_threshold = 1.e-10;
-      float_threshold = 1.e-7;
+      float_threshold = 1.e-7f;
       offset = 1.e-7;
     }
   else
diff --git a/source/fe/mapping_q_generic.cc b/source/fe/mapping_q_generic.cc
index eecbed9988..edfd93f9f4 100644
--- a/source/fe/mapping_q_generic.cc
+++ b/source/fe/mapping_q_generic.cc
@@ -1386,7 +1386,7 @@ namespace
    */
   Point<1>
   do_transform_real_to_unit_cell_internal
-  (const typename Triangulation<1,3>::cell_iterator &,
+  (const Triangulation<1,3>::cell_iterator &,
    const Point<3> &,
    const Point<1> &,
    MappingQGeneric<1,3>::InternalData &)
-- 
2.39.5