From e75d64c781ebd9156c23c24dd1aabf97b68bb666 Mon Sep 17 00:00:00 2001
From: Gerardo Tauriello <gerardo.tauriello@unibas.ch>
Date: Fri, 14 Jun 2019 16:06:30 +0200
Subject: [PATCH] SCHWED-4108: make template instantiations C++11 compliant
---
modules/img/alg/src/correlate.cc | 2 +-
modules/img/alg/src/density_slice.cc | 2 +-
modules/img/alg/src/fourier_filters.cc | 14 ++++++++------
modules/img/alg/src/gaussian_gradient_magnitude.cc | 2 +-
modules/img/alg/src/gaussian_laplacian.cc | 2 +-
modules/img/alg/src/highest_peak_search_3d.cc | 2 +-
6 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/modules/img/alg/src/correlate.cc b/modules/img/alg/src/correlate.cc
index f9ba50848..b473e20c0 100644
--- a/modules/img/alg/src/correlate.cc
+++ b/modules/img/alg/src/correlate.cc
@@ -86,6 +86,6 @@ ImageStateBasePtr ExplicitCorrelateFnc::VisitState(const ImageStateImpl<V,D>& is
}
}
-template class TEMPLATE_DEF_EXPORT ImageStateConstModOPAlgorithm<alg::ExplicitCorrelateFnc>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateConstModOPAlgorithm<alg::ExplicitCorrelateFnc>;
}} // ns
diff --git a/modules/img/alg/src/density_slice.cc b/modules/img/alg/src/density_slice.cc
index 2b54526be..dc5cedf7f 100644
--- a/modules/img/alg/src/density_slice.cc
+++ b/modules/img/alg/src/density_slice.cc
@@ -54,5 +54,5 @@ void SliceFnc::VisitState(ImageStateImpl<T,D>& isi) const
}
}
-template class TEMPLATE_DEF_EXPORT ImageStateConstModIPAlgorithm<alg::SliceFnc>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateConstModIPAlgorithm<alg::SliceFnc>;
}} // ns
diff --git a/modules/img/alg/src/fourier_filters.cc b/modules/img/alg/src/fourier_filters.cc
index 57462ecfe..a130b6f4c 100644
--- a/modules/img/alg/src/fourier_filters.cc
+++ b/modules/img/alg/src/fourier_filters.cc
@@ -254,12 +254,14 @@ typedef ImageStateConstModIPAlgorithm<ButterworthLPBase> ButterworthLP;
}}}} // ns
#ifndef NO_EXPL_INST
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::LPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::HPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::GaussianLPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::GaussianHPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::FermiLPBase>;
-template class ost::img::ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::ButterworthLPBase>;
+namespace ost { namespace img { namespace image_state {
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::LPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::HPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::GaussianLPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::GaussianHPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::FermiLPBase>;
+template class ImageStateConstModIPAlgorithm<ost::img::alg::filter_detail::ButterworthLPBase>;
+}}} // ns
#endif
diff --git a/modules/img/alg/src/gaussian_gradient_magnitude.cc b/modules/img/alg/src/gaussian_gradient_magnitude.cc
index ad3c32702..b8c760be6 100644
--- a/modules/img/alg/src/gaussian_gradient_magnitude.cc
+++ b/modules/img/alg/src/gaussian_gradient_magnitude.cc
@@ -143,6 +143,6 @@ void GaussianGradientMagnitudeFilterBase::calcBVals( Real q )
} // ns
-template class TEMPLATE_DEF_EXPORT ImageStateModIPAlgorithm<alg::GaussianGradientMagnitudeFilterBase>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateModIPAlgorithm<alg::GaussianGradientMagnitudeFilterBase>;
}}
diff --git a/modules/img/alg/src/gaussian_laplacian.cc b/modules/img/alg/src/gaussian_laplacian.cc
index 1a05a568d..fbe042644 100644
--- a/modules/img/alg/src/gaussian_laplacian.cc
+++ b/modules/img/alg/src/gaussian_laplacian.cc
@@ -137,5 +137,5 @@ void GaussianLaplacianFilterBase::calcBVals( Real q )
} // ns
-template class TEMPLATE_DEF_EXPORT ImageStateModIPAlgorithm<alg::GaussianLaplacianFilterBase>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateModIPAlgorithm<alg::GaussianLaplacianFilterBase>;
}}
diff --git a/modules/img/alg/src/highest_peak_search_3d.cc b/modules/img/alg/src/highest_peak_search_3d.cc
index 913586a08..a4a80e78e 100644
--- a/modules/img/alg/src/highest_peak_search_3d.cc
+++ b/modules/img/alg/src/highest_peak_search_3d.cc
@@ -177,7 +177,7 @@ template <typename T, class D>
} // ns
-template class TEMPLATE_DEF_EXPORT ImageStateNonModAlgorithm<alg::HighestPeakSearch3DBase>;
+template class TEMPLATE_DEF_EXPORT image_state::ImageStateNonModAlgorithm<alg::HighestPeakSearch3DBase>;
}} // ns
--
GitLab