From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sat, 15 Aug 2015 02:00:25 +0000 (-0500)
Subject: Fix a couple of compiler errors with non-MPI compiles.
X-Git-Tag: v8.4.0-rc2~604^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e4d38a86afcc534d4e69a2fc2b985075b5bde22;p=dealii.git

Fix a couple of compiler errors with non-MPI compiles.

This fixes other fallout from #212.
---

diff --git a/source/distributed/shared_tria.cc b/source/distributed/shared_tria.cc
index 65035186c9..b8832f527c 100644
--- a/source/distributed/shared_tria.cc
+++ b/source/distributed/shared_tria.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id: tria.cc 32807 2014-04-22 15:01:57Z heister $
 //
-// Copyright (C) 2008 - 2013 by the deal.II authors
+// Copyright (C) 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -106,15 +106,6 @@ namespace parallel
     {
       Assert (false, ExcNotImplemented());
     }
-
-    template <int dim, int spacedim>
-    types::subdomain_id
-    Triangulation<dim,spacedim>::locally_owned_subdomain () const
-    {
-      Assert (false, ExcNotImplemented());
-      return 0;
-    }
-
   }
 }
 
diff --git a/source/distributed/tria_base.cc b/source/distributed/tria_base.cc
index 39fd50d54c..94b53abd0c 100644
--- a/source/distributed/tria_base.cc
+++ b/source/distributed/tria_base.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2008 - 2013 by the deal.II authors
+// Copyright (C) 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -86,7 +86,9 @@ namespace parallel
   {
     std::size_t mem=
       this->dealii::Triangulation<dim,spacedim>::memory_consumption()
+#ifdef DEAL_II_WITH_MPI
       + MemoryConsumption::memory_consumption(mpi_communicator)
+#endif
       + MemoryConsumption::memory_consumption(my_subdomain)
       + MemoryConsumption::memory_consumption(number_cache.n_locally_owned_active_cells)
       + MemoryConsumption::memory_consumption(number_cache.n_global_active_cells)
@@ -98,9 +100,11 @@ namespace parallel
   template <int dim, int spacedim>
   Triangulation<dim,spacedim>::~Triangulation ()
   {
+#ifdef DEAL_II_WITH_MPI
     // get rid of the unique communicator used here again
     MPI_Comm_free (&this->mpi_communicator);
-  };
+#endif
+  }
 
   template <int dim, int spacedim>
   Triangulation<dim,spacedim>::NumberCache::NumberCache()