From 4100d5ea2beca57af1ff539275ad63e94e5df1e3 Mon Sep 17 00:00:00 2001
From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Wed, 19 Feb 2014 21:56:11 +0000
Subject: [PATCH] Avoid compiler warning. Improve error message for parallel
 vector.

git-svn-id: https://svn.dealii.org/trunk@32518 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/include/deal.II/base/aligned_vector.h | 20 ++++++++++++++-----
 deal.II/include/deal.II/lac/parallel_vector.h | 12 +++++++++++
 .../deal.II/lac/parallel_vector.templates.h   |  3 ++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/deal.II/include/deal.II/base/aligned_vector.h b/deal.II/include/deal.II/base/aligned_vector.h
index 2916bcd0ba..0876e0f6fe 100644
--- a/deal.II/include/deal.II/base/aligned_vector.h
+++ b/deal.II/include/deal.II/base/aligned_vector.h
@@ -288,9 +288,13 @@ namespace internal
     virtual void apply_to_subrange (const std::size_t begin,
                                     const std::size_t end) const
     {
-      // for classes trivial assignment can use memcpy
+      // for classes trivial assignment can use memcpy. cast element to
+      // (void*) to silence compiler warning for virtual classes (they will
+      // never arrive here because they are non-trivial).
+
       if (std_cxx1x::is_trivial<T>::value == true)
-        std::memcpy (destination_+begin, source_+begin, (end-begin)*sizeof(T));
+        std::memcpy ((void*)(destination_+begin), source_+begin,
+                     (end-begin)*sizeof(T));
       else if (copy_only_ == false)
         for (std::size_t i=begin; i<end; ++i)
           {
@@ -339,7 +343,10 @@ namespace internal
       if (std_cxx1x::is_trivial<T>::value == true)
         {
           const unsigned char zero [sizeof(T)] = {};
-          if (std::memcmp(zero, &element, sizeof(T)) == 0)
+          // cast element to (void*) to silence compiler warning for virtual
+          // classes (they will never arrive here because they are
+          // non-trivial).
+          if (std::memcmp(zero, (void*)&element, sizeof(T)) == 0)
             trivial_element = true;
         }
       if (size < minimum_parallel_grain_size)
@@ -356,9 +363,12 @@ namespace internal
     virtual void apply_to_subrange (const std::size_t begin,
                                     const std::size_t end) const
     {
-      // for classes with trivial assignment of zero can use memset
+      // for classes with trivial assignment of zero can use memset. cast
+      // element to (void*) to silence compiler warning for virtual
+      // classes (they will never arrive here because they are
+      // non-trivial).
       if (std_cxx1x::is_trivial<T>::value == true && trivial_element)
-        std::memset (destination_+begin, 0, (end-begin)*sizeof(T));
+        std::memset ((void*)(destination_+begin), 0, (end-begin)*sizeof(T));
       else
         // initialize memory and set
         for (std::size_t i=begin; i<end; ++i)
diff --git a/deal.II/include/deal.II/lac/parallel_vector.h b/deal.II/include/deal.II/lac/parallel_vector.h
index 126737eba7..92259610af 100644
--- a/deal.II/include/deal.II/lac/parallel_vector.h
+++ b/deal.II/include/deal.II/lac/parallel_vector.h
@@ -932,6 +932,18 @@ namespace parallel
       std::size_t memory_consumption () const;
       //@}
 
+      /**
+       * Exception
+       */
+      DeclException3 (ExcNonMatchingElements,
+                      double, double, unsigned int,
+                      << "Called compress(VectorOperation::insert), but"
+                      << " the element received from a remote processor, value "
+                      << std::setprecision(16) << arg1
+                      << ", does not match with the value "
+                      << std::setprecision(16) << arg2
+                      << " on the owner processor " << arg3);
+
     private:
       /**
        * Local part of all_zero().
diff --git a/deal.II/include/deal.II/lac/parallel_vector.templates.h b/deal.II/include/deal.II/lac/parallel_vector.templates.h
index 252c5b926c..b053621bc7 100644
--- a/deal.II/include/deal.II/lac/parallel_vector.templates.h
+++ b/deal.II/include/deal.II/lac/parallel_vector.templates.h
@@ -454,7 +454,8 @@ namespace parallel
                        std::abs(local_element(j) - *read_position) <
                        std::abs(local_element(j)) * 1000. *
                        std::numeric_limits<Number>::epsilon(),
-                       ExcMessage("Inserted elements do not match."));
+                       ExcNonMatchingElements(*read_position, local_element(j),
+                                              part.this_mpi_process()));
           AssertDimension(read_position-import_data,part.n_import_indices());
         }
 
-- 
2.39.5