From 5cd5bb251fcbb909c2aa6edc2bedc4478475aaba Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 17 Jan 2008 23:50:08 +0000 Subject: [PATCH] Undefine our own #defines git-svn-id: https://svn.dealii.org/trunk@15632 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/numerics/data_out.cc | 6 +++++- deal.II/deal.II/source/numerics/derivative_approximation.cc | 4 +++- deal.II/deal.II/source/numerics/error_estimator.cc | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 4d462fb223..aefb3f2322 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -1159,4 +1159,8 @@ INSTANTIATE_VECTORS(hp::DoFHandler,deal_II_dimension-1,deal_I template class DataOut >; + +#undef INSTANTIATE +#undef INSTANTIATE_VECTORS + DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/numerics/derivative_approximation.cc b/deal.II/deal.II/source/numerics/derivative_approximation.cc index 269231d24b..e284dcf7a0 100644 --- a/deal.II/deal.II/source/numerics/derivative_approximation.cc +++ b/deal.II/deal.II/source/numerics/derivative_approximation.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -1014,6 +1014,8 @@ INSTANTIATE(PETScWrappers::Vector, hp::DoFHandler); INSTANTIATE(PETScWrappers::BlockVector, hp::DoFHandler); #endif +#undef INSTANTIATE + template double DerivativeApproximation:: diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index 8051a74d76..38f23b390a 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -1665,4 +1665,8 @@ INSTANTIATE(PETScWrappers::Vector,hp::DoFHandler); INSTANTIATE(PETScWrappers::BlockVector,hp::DoFHandler); #endif +#undef INSTANTIATE +#undef INSTANTIATE_1 + + DEAL_II_NAMESPACE_CLOSE -- 2.39.5