]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add some missing ::dealii which are required if DEAL_II_USE_PETSC.
authorhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 23 Oct 2006 16:31:28 +0000 (16:31 +0000)
committerhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 23 Oct 2006 16:31:28 +0000 (16:31 +0000)
git-svn-id: https://svn.dealii.org/trunk@14051 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/petsc_block_vector.h
deal.II/lac/include/lac/petsc_parallel_block_vector.h
deal.II/lac/include/lac/petsc_vector_base.h
deal.II/lac/source/petsc_solver.cc

index f2ed580ecfcc64abf5026643faf0739a96f7d126..9cfb8990a1b62837e197ff73e484af5708109cd8 100644 (file)
@@ -457,7 +457,7 @@ namespace PETScWrappers
   
     for (unsigned int i=0; i<this->n_blocks(); ++i)
       this->components[i].swap (v.components[i]);
-    ::swap (this->block_indices, v.block_indices);
+    ::dealii::swap (this->block_indices, v.block_indices);
   }
 
 
index 8d752f320dd05dce1570e9d604442604c55b1ed4..500a9123f718db57b19c3b61d49d6c883ea00599 100644 (file)
@@ -448,7 +448,7 @@ namespace PETScWrappers
   
       for (unsigned int i=0; i<this->n_blocks(); ++i)
         this->components[i].swap (v.components[i]);
-      ::swap (this->block_indices, v.block_indices);
+      ::dealii::swap (this->block_indices, v.block_indices);
     }
   
 
index 4f176e2dd445389f9e2cc8189c1821d1e5ff0d5e..eb1b9963a956fff9281d545b5df6fd9e0d109851 100644 (file)
@@ -180,7 +180,7 @@ namespace PETScWrappers
                                           * that it can create objects of the
                                           * present type.
                                           */
-        friend class ::PETScWrappers::VectorBase;
+        friend class ::dealii::PETScWrappers::VectorBase;
     };
   }
                                    /**
index be98e020953c5330b6dfd1b82d04d614e8220f18..59d2f97d71186da88030740d3e3e4731a5161a93 100644 (file)
@@ -226,15 +226,15 @@ namespace PETScWrappers
     
     switch (state)
       {
-        case ::SolverControl::iterate:
+        case ::dealii::SolverControl::iterate:
               *reason = KSP_CONVERGED_ITERATING;
               break;
               
-        case ::SolverControl::success:
+        case ::dealii::SolverControl::success:
               *reason = static_cast<KSPConvergedReason>(1);
               break;
               
-        case ::SolverControl::failure:
+        case ::dealii::SolverControl::failure:
               if (solver_control.last_step() > solver_control.max_steps())
                 *reason = KSP_DIVERGED_ITS;
               else

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.