From ccb3e062664b720fe961b2f2c5b8c1d9e8cfe0c6 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Wed, 16 Mar 2005 19:52:43 +0000 Subject: [PATCH] id for SmartPointer git-svn-id: https://svn.dealii.org/trunk@10174 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/multigrid/mg_coarse.h | 14 +++++++------- deal.II/deal.II/include/multigrid/mg_matrix.h | 4 ++-- deal.II/deal.II/include/multigrid/multigrid.h | 14 +++++++------- .../include/multigrid/multigrid.templates.h | 14 +++++++------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/deal.II/deal.II/include/multigrid/mg_coarse.h b/deal.II/deal.II/include/multigrid/mg_coarse.h index 8804b74b3a..1dedac20c1 100644 --- a/deal.II/deal.II/include/multigrid/mg_coarse.h +++ b/deal.II/deal.II/include/multigrid/mg_coarse.h @@ -170,9 +170,9 @@ template MGCoarseGridLACIteration ::MGCoarseGridLACIteration() : - solver(0), - matrix(0), - precondition(0) + solver(0, typeid(*this).name()), + matrix(0, typeid(*this).name()), + precondition(0, typeid(*this).name()) {} @@ -182,9 +182,9 @@ MGCoarseGridLACIteration const MATRIX &m, const PRECOND &p) : - solver(&s), - matrix(&m), - precondition(&p) + solver(&s, typeid(*this).name()), + matrix(&m, typeid(*this).name()), + precondition(&p, typeid(*this).name()) {} @@ -240,7 +240,7 @@ template MGCoarseGridHouseholder::MGCoarseGridHouseholder( const FullMatrix* A) : - matrix(A) + matrix(A, typeid(*this).name()) {} diff --git a/deal.II/deal.II/include/multigrid/mg_matrix.h b/deal.II/deal.II/include/multigrid/mg_matrix.h index 60f77b4405..4f5de38231 100644 --- a/deal.II/deal.II/include/multigrid/mg_matrix.h +++ b/deal.II/deal.II/include/multigrid/mg_matrix.h @@ -190,7 +190,7 @@ class MGMatrixSelect : public MGMatrixBase > template MGMatrix::MGMatrix (MGLevelObject* p) : - matrix (p) + matrix (p, typeid(*this).name()) {} @@ -269,7 +269,7 @@ MGMatrixSelect (const unsigned int row, const unsigned int col, MGLevelObject* p) : - matrix (p), + matrix (p, typeid(*this).name()), row(row), col(col) {} diff --git a/deal.II/deal.II/include/multigrid/multigrid.h b/deal.II/deal.II/include/multigrid/multigrid.h index ef909a42d8..4b5ef4d707 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.h +++ b/deal.II/deal.II/include/multigrid/multigrid.h @@ -463,13 +463,13 @@ Multigrid::Multigrid (const MGDoFHandler& mg_dof_handler, solution(minlevel,maxlevel), t(minlevel,maxlevel), defect2(minlevel,maxlevel), - matrix(&matrix), - coarse(&coarse), - transfer(&transfer), - pre_smooth(&pre_smooth), - post_smooth(&post_smooth), - edge_down(0), - edge_up(0), + matrix(&matrix, typeid(*this).name()), + coarse(&coarse, typeid(*this).name()), + transfer(&transfer, typeid(*this).name()), + pre_smooth(&pre_smooth, typeid(*this).name()), + post_smooth(&post_smooth, typeid(*this).name()), + edge_down(0, typeid(*this).name()), + edge_up(0, typeid(*this).name()), debug(0) {} diff --git a/deal.II/deal.II/include/multigrid/multigrid.templates.h b/deal.II/deal.II/include/multigrid/multigrid.templates.h index c803157139..2c36f0114e 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.templates.h +++ b/deal.II/deal.II/include/multigrid/multigrid.templates.h @@ -37,13 +37,13 @@ Multigrid::Multigrid (const unsigned int minlevel, defect(minlevel,maxlevel), solution(minlevel,maxlevel), t(minlevel,maxlevel), - matrix(&matrix), - coarse(&coarse), - transfer(&transfer), - pre_smooth(&pre_smooth), - post_smooth(&post_smooth), - edge_down(0), - edge_up(0), + matrix(&matrix, typeid(*this).name()), + coarse(&coarse, typeid(*this).name()), + transfer(&transfer, typeid(*this).name()), + pre_smooth(&pre_smooth, typeid(*this).name()), + post_smooth(&post_smooth, typeid(*this).name()), + edge_down(0, typeid(*this).name()), + edge_up(0, typeid(*this).name()), debug(0) {} -- 2.39.5