From: Wolfgang Bangerth Date: Wed, 20 Apr 2016 15:33:12 +0000 (-0500) Subject: Comment out argument names for move constructors/operators. X-Git-Tag: v8.5.0-rc1~1089^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2529%2Fhead;p=dealii.git Comment out argument names for move constructors/operators. This avoids warnings by gcc 4.6 which takes a '=default' declaration to be a function definition in which it doesn't use the name of the argument. It then proceeds to issue a warning about an unused argument :-( This patch avoids this. --- diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h index 78342c74af..0186b56cef 100644 --- a/include/deal.II/lac/block_vector.h +++ b/include/deal.II/lac/block_vector.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 1999 - 2015 by the deal.II authors +// Copyright (C) 1999 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -107,12 +107,12 @@ public: #ifdef DEAL_II_WITH_CXX11 /** * Move constructor. Creates a new vector by stealing the internal data of - * the vector @p v. + * the given argument vector. * * @note This constructor is only available if deal.II is configured with * C++11 support. */ - BlockVector (BlockVector &&v) = default; + BlockVector (BlockVector &&/*v*/) = default; #endif @@ -202,13 +202,13 @@ public: #ifdef DEAL_II_WITH_CXX11 /** - * Move the given vector. This operator replaces the present vector with @p - * v by efficiently swapping the internal data structures. + * Move the given vector. This operator replaces the present vector with + * the contents of the given argument vector. * * @note This operator is only available if deal.II is configured with C++11 * support. */ - BlockVector &operator= (BlockVector &&v) = default; + BlockVector &operator= (BlockVector &&/*v*/) = default; #endif /** diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h index fd7ddb6f74..9884463502 100644 --- a/include/deal.II/lac/block_vector_base.h +++ b/include/deal.II/lac/block_vector_base.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2015 by the deal.II authors +// Copyright (C) 2004 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -584,14 +584,14 @@ public: BlockVectorBase (const BlockVectorBase &V) = default; /** - * Move constructor. Each block of the vector @p V is moved into the current + * Move constructor. Each block of the argument vector is moved into the current * object if the underlying VectorType is move-constructible, * otherwise they are copied. * * @note This constructor is only available if deal.II is configured with * C++11 support. */ - BlockVectorBase (BlockVectorBase &&V) = default; + BlockVectorBase (BlockVectorBase &&/*V*/) = default; #endif /** @@ -742,10 +742,11 @@ public: #ifdef DEAL_II_WITH_CXX11 /** - * Move assignment operator. Move each block of the vector @p V into the - * current object if `VectorType` is move-constructible, otherwise copy them. + * Move assignment operator. Move each block of the given argument + * vector into the current object if `VectorType` is + * move-constructible, otherwise copy them. */ - BlockVectorBase &operator= (BlockVectorBase &&V) = default; + BlockVectorBase &operator= (BlockVectorBase &&/*V*/) = default; #endif /**