[Clang][Windows] Remove workarounds

This commit is contained in:
Mat Sutcliffe
2021-10-05 15:47:44 +01:00
parent fb43405277
commit 916448ef6a
19 changed files with 89 additions and 229 deletions

View File

@@ -887,7 +887,7 @@ namespace BlackMisc::Simulation
// see here for the reason of thess forward instantiations
// https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
//! \cond PRIVATE
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE CInterpolator<CInterpolatorLinear>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE CInterpolator<CInterpolatorSpline>;
template class CInterpolator<CInterpolatorLinear>;
template class CInterpolator<CInterpolatorSpline>;
//! \endcond
} // namespace

View File

@@ -85,26 +85,4 @@ namespace BlackMisc
}
}
#if defined(Q_OS_WIN) && defined(Q_CC_CLANG)
namespace Private
{
template void maybeRegisterMetaListConvert<Simulation::FsCommon::CAircraftCfgEntriesList>(int);
template void maybeRegisterMetaListConvert<Simulation::CAircraftModelList>(int);
template void maybeRegisterMetaListConvert<Simulation::CDistributorList>(int);
template void maybeRegisterMetaListConvert<Simulation::CInterpolationSetupList>(int);
template void maybeRegisterMetaListConvert<Simulation::CMatchingStatistics>(int);
template void maybeRegisterMetaListConvert<Simulation::CSimulatedAircraftList>(int);
template void maybeRegisterMetaListConvert<Simulation::CSimulatorInfoList>(int);
template void maybeRegisterMetaListConvert<Simulation::CSimulatorPluginInfoList>(int);
template void maybeRegisterMetaListConvert<CSequence<Simulation::FsCommon::CAircraftCfgEntries>>(int);
template void maybeRegisterMetaListConvert<CSequence<Simulation::CAircraftModel>>(int);
template void maybeRegisterMetaListConvert<CSequence<Simulation::CDistributor>>(int);
template void maybeRegisterMetaListConvert<CSequence<Simulation::CInterpolationAndRenderingSetupPerCallsign>>(int);
template void maybeRegisterMetaListConvert<CSequence<Simulation::CMatchingStatisticsEntry>>(int);
template void maybeRegisterMetaListConvert<CSequence<Simulation::CSimulatedAircraft>>(int);
template void maybeRegisterMetaListConvert<CSequence<Simulation::CSimulatorInfo>>(int);
template void maybeRegisterMetaListConvert<CSequence<Simulation::CSimulatorPluginInfo>>(int);
} // ns
#endif
} // ns