[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

@@ -261,9 +261,9 @@ namespace BlackMisc::Aviation
// see here for the reason of the forward instantiations
// https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
//! \cond PRIVATE
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE CModulator<CComSystem>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE CModulator<CNavSystem>;
template class BLACKMISC_EXPORT_DEFINE_TEMPLATE CModulator<CAdfSystem>;
template class CModulator<CComSystem>;
template class CModulator<CNavSystem>;
template class CModulator<CAdfSystem>;
//! \endcond
} // namespace

View File

@@ -55,30 +55,4 @@ namespace BlackMisc
}
}
#if defined(Q_OS_WIN) && defined(Q_CC_CLANG)
namespace Private
{
template void maybeRegisterMetaListConvert<Aviation::CAircraftEngineList>(int);
template void maybeRegisterMetaListConvert<Aviation::CAircraftIcaoCodeList>(int);
template void maybeRegisterMetaListConvert<Aviation::CAircraftCategoryList>(int);
template void maybeRegisterMetaListConvert<Aviation::CAircraftPartsList>(int);
template void maybeRegisterMetaListConvert<Aviation::CAircraftSituationList>(int);
template void maybeRegisterMetaListConvert<Aviation::CAirlineIcaoCodeList>(int);
template void maybeRegisterMetaListConvert<Aviation::CAirportList>(int);
template void maybeRegisterMetaListConvert<Aviation::CAtcStationList>(int);
template void maybeRegisterMetaListConvert<Aviation::CFlightPlanList>(int);
template void maybeRegisterMetaListConvert<Aviation::CLiveryList>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CAircraftEngine>>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CAircraftIcaoCode>>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CAircraftCategory>>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CAircraftParts>>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CAircraftSituation>>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CAirlineIcaoCode>>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CAirport>>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CAtcStation>>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CFlightPlan>>(int);
template void maybeRegisterMetaListConvert<CSequence<Aviation::CLivery>>(int);
} // ns
#endif
} // ns