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 65035186c942e6084965a61c100aec535379c4ac..b8832f527c3dcae04c84e21d124cbadbbb85e1bf 100644 (file)
--- 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 39fd50d54c0d0e5434773bf3ed80ad938d8ca013..94b53abd0c2c4c90d469d754a407d2d0bc5012ff 100644 (file)
--- 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()