]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Delete the constructor of p::d::Triangulation when no p4est is available.
authorWolfgang Bangerth <bangerth@colostate.edu>
Wed, 12 Jul 2017 16:11:39 +0000 (10:11 -0600)
committerWolfgang Bangerth <bangerth@colostate.edu>
Wed, 12 Jul 2017 16:29:18 +0000 (10:29 -0600)
include/deal.II/distributed/tria.h
source/distributed/tria.cc

index 886a65ce47ad4d1d06c690f581613f1185c9aa5b..de8a9ec73633da5b5eb73967626e37f9738479bb 100644 (file)
@@ -1029,18 +1029,19 @@ namespace parallel
      * parallel::distributed::Triangulation objects throughout the library
      * even if it is disabled.
      *
-     * Since the constructor of this class is private, no such objects can
-     * actually be created if we don't have p4est available.
+     * Since the constructor of this class is deleted, no such objects
+     * can actually be created as this would be pointless given that
+     * p4est is not available.
      */
     template <int dim, int spacedim = dim>
     class Triangulation : public dealii::parallel::Triangulation<dim,spacedim>
     {
-    private:
+    public:
       /**
-       * Constructor.
+       * Constructor. Deleted to make sure that objects of this type cannot be
+       * constructed (see also the class documentation).
        */
-      Triangulation ();
-
+      Triangulation () = delete;
     };
   }
 }
index 5aa1a4107f9995cf882bbdd8a3c6e5d54a1deb0d..f67891a4a05c5dc6d16cb4f4b1892692650cc422 100644 (file)
@@ -3932,22 +3932,6 @@ namespace parallel
 }
 
 
-#else // DEAL_II_WITH_P4EST
-
-namespace parallel
-{
-  namespace distributed
-  {
-    template <int dim, int spacedim>
-    Triangulation<dim,spacedim>::Triangulation ()
-      :
-      dealii::parallel::Triangulation<dim,spacedim>(MPI_COMM_SELF)
-    {
-      Assert (false, ExcNotImplemented());
-    }
-  }
-}
-
 #endif // DEAL_II_WITH_P4EST
 
 

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.