Skip to content

Commit 89f886a

Browse files
committed
1 parent 2f01368 commit 89f886a

File tree

3 files changed

+25
-20
lines changed

3 files changed

+25
-20
lines changed

source/lac/la_parallel_block_vector.cc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,17 @@ namespace LinearAlgebra
3030
{
3131
namespace distributed
3232
{
33-
#define TEMPL_COPY_CONSTRUCTOR(S1, S2) \
34-
template BlockVector<S1, ::dealii::MemorySpace::Host> & \
35-
BlockVector<S1, ::dealii::MemorySpace::Host>::operator= \
36-
<S2>(const BlockVector<S2, ::dealii::MemorySpace::Host> &)
33+
#ifndef DOXYGEN
34+
# define TEMPL_COPY_CONSTRUCTOR(S1, S2) \
35+
template BlockVector<S1, ::dealii::MemorySpace::Host> & \
36+
BlockVector<S1, ::dealii::MemorySpace::Host>::operator= \
37+
<S2>(const BlockVector<S2, ::dealii::MemorySpace::Host> &)
3738

3839
TEMPL_COPY_CONSTRUCTOR(double, float);
3940
TEMPL_COPY_CONSTRUCTOR(float, double);
4041

41-
#undef TEMPL_COPY_CONSTRUCTOR
42+
# undef TEMPL_COPY_CONSTRUCTOR
43+
#endif
4244
} // namespace distributed
4345
} // namespace LinearAlgebra
4446

source/lac/la_parallel_vector.cc

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,25 @@ namespace LinearAlgebra
2828
{
2929
namespace distributed
3030
{
31-
#define TEMPL_COPY_CONSTRUCTOR(S1, S2) \
32-
template Vector<S1, ::dealii::MemorySpace::Host> & \
33-
Vector<S1, ::dealii::MemorySpace::Host>::operator= \
34-
<S2>(const Vector<S2, ::dealii::MemorySpace::Host> &)
31+
#ifndef DOXYGEN
32+
33+
# define TEMPL_COPY_CONSTRUCTOR(S1, S2) \
34+
template Vector<S1, ::dealii::MemorySpace::Host> & \
35+
Vector<S1, ::dealii::MemorySpace::Host>::operator= \
36+
<S2>(const Vector<S2, ::dealii::MemorySpace::Host> &)
3537

3638
TEMPL_COPY_CONSTRUCTOR(double, float);
3739
TEMPL_COPY_CONSTRUCTOR(float, double);
38-
#ifdef DEAL_II_WITH_COMPLEX_VALUES
40+
# ifdef DEAL_II_WITH_COMPLEX_VALUES
3941
TEMPL_COPY_CONSTRUCTOR(std::complex<double>, std::complex<float>);
4042
TEMPL_COPY_CONSTRUCTOR(std::complex<float>, std::complex<double>);
41-
#endif
43+
# endif
4244

43-
#undef TEMPL_COPY_CONSTRUCTOR
45+
# undef TEMPL_COPY_CONSTRUCTOR
4446

4547
template class Vector<float, ::dealii::MemorySpace::Default>;
4648
template class Vector<double, ::dealii::MemorySpace::Default>;
4749

48-
#ifndef DOXYGEN
4950
template void
5051
Vector<float, ::dealii::MemorySpace::Host>::import_elements<
5152
::dealii::MemorySpace::Default>(

source/lac/read_write_vector.cc

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,23 @@ namespace LinearAlgebra
2525
// two template arguments that need to be different (the case of same
2626
// arguments is covered by the default copy constructor and copy operator that
2727
// is declared separately)
28+
#ifndef DOXYGEN
2829

29-
#define TEMPL_COPY_CONSTRUCTOR(S1, S2) \
30-
template ReadWriteVector<S1> &ReadWriteVector<S1>::operator= \
31-
<S2>(const ReadWriteVector<S2> &)
30+
# define TEMPL_COPY_CONSTRUCTOR(S1, S2) \
31+
template ReadWriteVector<S1> &ReadWriteVector<S1>::operator= \
32+
<S2>(const ReadWriteVector<S2> &)
3233

3334
TEMPL_COPY_CONSTRUCTOR(double, float);
3435
TEMPL_COPY_CONSTRUCTOR(float, double);
35-
#ifdef DEAL_II_WITH_COMPLEX_VALUES
36+
# ifdef DEAL_II_WITH_COMPLEX_VALUES
3637
TEMPL_COPY_CONSTRUCTOR(std::complex<double>, std::complex<float>);
3738
TEMPL_COPY_CONSTRUCTOR(std::complex<float>, std::complex<double>);
38-
#endif
39+
# endif
40+
41+
# undef TEMPL_COPY_CONSTRUCTOR
42+
3943

40-
#undef TEMPL_COPY_CONSTRUCTOR
4144

42-
#ifndef DOXYGEN
4345
template void
4446
ReadWriteVector<float>::import_elements(
4547
const distributed::Vector<float, ::dealii::MemorySpace::Host> &,

0 commit comments

Comments
 (0)