SCHWED-4108: make template instantiations C++11 compliant

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
 

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

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
 
 

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>;
 
 }}

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>;
 }}

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