From: Martin Kronbichler Date: Sat, 3 Oct 2020 19:13:18 +0000 (+0200) Subject: Compile grid_tools.cc in a single file X-Git-Tag: v9.3.0-rc1~1038^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=396ab872d5b0ee955b4488682b8dde2a7adba5d4;p=dealii.git Compile grid_tools.cc in a single file --- diff --git a/source/grid/CMakeLists.txt b/source/grid/CMakeLists.txt index 062c6d14bc..d50cbdec9b 100644 --- a/source/grid/CMakeLists.txt +++ b/source/grid/CMakeLists.txt @@ -36,7 +36,6 @@ SET(_separate_src grid_out.cc grid_generator.cc grid_tools.cc - grid_tools_2.cc grid_tools_cache.cc grid_tools_nontemplates.cc grid_tools_dof_handlers.cc diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index 2499c4f272..f0088f4755 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -5712,10 +5712,6 @@ namespace GridTools // explicit instantiations -#define SPLIT_INSTANTIATIONS_COUNT 2 -#ifndef SPLIT_INSTANTIATIONS_INDEX -# define SPLIT_INSTANTIATIONS_INDEX 0 -#endif #include "grid_tools.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_tools_2.cc b/source/grid/grid_tools_2.cc deleted file mode 100644 index 4fb283497f..0000000000 --- a/source/grid/grid_tools_2.cc +++ /dev/null @@ -1,17 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2020 - 2020 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE.md at -// the top level directory of deal.II. -// -// --------------------------------------------------------------------- - -#define SPLIT_INSTANTIATIONS_INDEX 1 -#include "grid_tools.cc"