]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix a problem with the intel compiler and VectorReference objects.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 9 Nov 2011 17:00:46 +0000 (17:00 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 9 Nov 2011 17:00:46 +0000 (17:00 +0000)
git-svn-id: https://svn.dealii.org/trunk@24740 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/news/changes.h
deal.II/include/deal.II/lac/trilinos_vector_base.h

index c39d3e4bc9ef8723993c87cc1aa22fa92a3f7b94..9aeb6cb33e5968998fdc9b480d256a02b8058308 100644 (file)
@@ -34,6 +34,11 @@ inconvenience this causes.
 <h3>General</h3>
 
 <ol>
+<li> Fixed: The Intel compiler complains that it can't copy Trilinos vector
+reference objects, preventing the compiling of step-32. This is now fixed.
+<br>
+(Wolfgang Bangerth, 2011/11/09)
+
 <li> Fixed: Intel ICC 12.1 gets into trouble with BOOST because BOOST
 believes that the compiler supports C++0x but one then still has to
 specify the corresponding flag on the command line to avoid compiler
index 914b628b240647d6324b11f4e31e65b98cfc6141..d646ec54b62c41467ff5467ba80e1e70931e5cc9 100644 (file)
@@ -121,6 +121,13 @@ namespace TrilinosWrappers
        const VectorReference &
          operator = (const VectorReference &r) const;
 
+                                        /**
+                                         * Same as above but for non-const
+                                         * reference objects.
+                                         */
+       const VectorReference &
+         operator = (const VectorReference &r);
+
                                        /**
                                        * Set the referenced element of the
                                        * vector to <tt>s</tt>.
@@ -1041,6 +1048,17 @@ namespace TrilinosWrappers
 
 
 
+    inline
+    const VectorReference &
+    VectorReference::operator = (const VectorReference &r)
+    {
+                                        // as above
+      *this = static_cast<TrilinosScalar> (r);
+
+      return *this;
+    }
+
+
     inline
     const VectorReference &
     VectorReference::operator = (const TrilinosScalar &value) const

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.