Refs #15283 Create template declaraions for Singletons

Framework/API/CMakeLists.txt

@@ -12,6 +12,7 @@ set ( SRC_FILES
 	src/Axis.cpp
 	src/BinEdgeAxis.cpp
 	src/BoxController.cpp
+        src/CatalogFactory.cpp
 	src/CatalogManager.cpp
 	src/CatalogSession.cpp
 	src/ChopperModel.cpp

Framework/API/inc/MantidAPI/AlgorithmFactory.h

@@ -168,14 +168,6 @@ private:
   VersionMap m_vmap;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>;
-#endif /* _WIN32 */
-
 typedef Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>
     AlgorithmFactory;
 
@@ -188,4 +180,10 @@ typedef const Poco::AutoPtr<Mantid::Kernel::DynamicFactory<
 } // namespace API
 } // namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::AlgorithmFactoryImpl>;
+}
+}
+
 #endif /*MANTID_API_ALGORITHMFACTORY_H_*/

Framework/API/inc/MantidAPI/AnalysisDataService.h

@@ -178,14 +178,7 @@ private:
   std::string m_illegalChars;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AnalysisDataServiceImpl (needed for dllexport/dllimport) and a typedef for
-/// it.
-#ifdef _WIN32
-// this breaks new namespace declaration rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>;
-#endif /* _WIN32 */
+
 typedef Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>
     AnalysisDataService;
 
@@ -249,4 +242,10 @@ typedef const Poco::AutoPtr<AnalysisDataServiceImpl::GroupUpdatedNotification> &
 } // Namespace API
 } // Namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::AnalysisDataServiceImpl>;
+}
+}
+
 #endif /*MANTID_KERNEL_ANALYSISDATASERVICE_H_*/

Framework/API/inc/MantidAPI/ArchiveSearchFactory.h

@@ -56,17 +56,15 @@ private:
   ~ArchiveSearchFactoryImpl() override = default;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>;
-#endif /* _WIN32 */
-
 typedef Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>
     ArchiveSearchFactory;
 }
 }
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::ArchiveSearchFactoryImpl>;
+}
+}
+
 #endif // MANTID_API_ARCHIVESEARCHFACTORY_H_

Framework/API/inc/MantidAPI/CatalogFactory.h

@@ -76,13 +76,6 @@ private:
   mutable std::map<std::string, boost::shared_ptr<ICatalog>> m_createdCatalogs;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// CatalogFactoryImpl (needed for dllexport/dllimport) .
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<CatalogFactoryImpl>;
-#endif /* _WIN32 */
 /// The specialisation of the SingletonHolder class that holds the
 /// CatalogFactory
 typedef Mantid::Kernel::SingletonHolder<CatalogFactoryImpl>
@@ -91,4 +84,10 @@ typedef Mantid::Kernel::SingletonHolder<CatalogFactoryImpl>
 } // namespace API
 } // namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::CatalogFactoryImpl>;
+}
+}
+
 #endif /*MANTID_API_CATALOGFACTORYIMPL_H_*/

Framework/API/inc/MantidAPI/CatalogManager.h

@@ -67,11 +67,14 @@ private:
   std::map<CatalogSession_sptr, ICatalog_sptr> m_activeCatalogs;
 };
 
-#ifdef _WIN32
-template class MANTID_API_DLL Kernel::SingletonHolder<CatalogManagerImpl>;
-#endif
 typedef Kernel::SingletonHolder<CatalogManagerImpl>
     CatalogManager;
 }
 }
+
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Kernel::SingletonHolder<Mantid::API::CatalogManagerImpl>;
+}
+}
 #endif /* MANTID_ICAT_CATALOGMANAGERIMPL_H_ */

Framework/API/inc/MantidAPI/ColumnFactory.h

@@ -63,17 +63,16 @@ private:
   ~ColumnFactoryImpl() override = default;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<ColumnFactoryImpl>;
-#endif /* _WIN32 */
 typedef Mantid::Kernel::SingletonHolder<ColumnFactoryImpl>
     ColumnFactory;
 
 } // namespace API
 } // namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::ColumnFactoryImpl>;
+}
+}
+
 #endif /*MANTID_API_COLUMNFACTORY_H_*/

Framework/API/inc/MantidAPI/ConstraintFactory.h

@@ -72,19 +72,18 @@ private:
   ~ConstraintFactoryImpl() override = default;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>;
-#endif /* _WIN32 */
 typedef Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>
     ConstraintFactory;
 
 } // namespace API
 } // namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::ConstraintFactoryImpl>;
+}
+}
+
 /**
  * Macro for declaring a new type of function to be used with the
  * FunctionFactory

Framework/API/inc/MantidAPI/CostFunctionFactory.h

@@ -63,17 +63,17 @@ private:
   CostFunctionFactoryImpl();
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>;
-#endif /* _WIN32 */
 typedef Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>
     CostFunctionFactory;
 
 } // namespace API
 } // namespace Mantid
 
+
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::CostFunctionFactoryImpl>;
+}
+}
+
 #endif /*MANTID_API_COSTFUNCTIONFACTORY_H_*/

Framework/API/inc/MantidAPI/DllConfig.h

@@ -32,8 +32,10 @@
 
 #ifdef IN_MANTID_API
 #define MANTID_API_DLL DLLExport
+#define EXTERN_MANTID_API extern
 #else
 #define MANTID_API_DLL DLLImport
+#define EXTERN_MANTID_API extern
 #endif /* IN_MANTID_API*/
 
 #endif // MANTID_API_DLLCONFIG_H_

Framework/API/inc/MantidAPI/DomainCreatorFactory.h

@@ -68,18 +68,16 @@ private:
   using Kernel::DynamicFactory<IDomainCreator>::createUnwrapped;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// DomainCreatorFactoryImpl (needed for dllexport/dllimport) and a typedef for
-/// it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>;
-#endif /* _WIN32 */
 typedef Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>
     DomainCreatorFactory;
 
 } // namespace API
 } // namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::DomainCreatorFactoryImpl>;
+}
+}
+
 #endif /* MANTID_API_DOMAINCREATORFACTORY_H_ */

Framework/API/inc/MantidAPI/FileFinder.h

@@ -94,16 +94,15 @@ private:
   int m_globOption;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<FileFinderImpl>;
-#endif /* _WIN32 */
-
 typedef Mantid::Kernel::SingletonHolder<FileFinderImpl>
     FileFinder;
 }
 }
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FileFinderImpl>;
+}
+}
+
 #endif // MANTID_API_FILEFINDER_H_

Framework/API/inc/MantidAPI/FileLoaderRegistry.h

@@ -144,15 +144,6 @@ private:
   mutable Kernel::Logger m_log;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// FileLoaderRegistryImpl (needed for dllexport/dllimport) and a typedef for
-/// it.
-#ifdef _WIN32
-// this breaks new namespace declaration rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>;
-#endif /* _WIN32 */
-
 /// Type for the actual singleton instance
 typedef Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>
     FileLoaderRegistry;
@@ -160,4 +151,10 @@ typedef Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>
 } // namespace API
 } // namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FileLoaderRegistryImpl>;
+}
+}
+
 #endif /* MANTID_API_FILELOADERREGISTRY_H_ */

Framework/API/inc/MantidAPI/FrameworkManager.h

@@ -135,17 +135,16 @@ private:
 #endif
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
-#ifdef _WIN32
-// this breaks new namespace declaration rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<FrameworkManagerImpl>;
-#endif /* _WIN32 */
 typedef Mantid::Kernel::SingletonHolder<FrameworkManagerImpl>
     FrameworkManager;
 
 } // namespace Kernel
 } // namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FrameworkManagerImpl>;
+}
+}
+
 #endif /*MANTID_API_FRAMEWORKMANAGER_H_*/

Framework/API/inc/MantidAPI/FuncMinimizerFactory.h

@@ -61,19 +61,18 @@ private:
   FuncMinimizerFactoryImpl();
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>;
-#endif /* _WIN32 */
 typedef Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>
     FuncMinimizerFactory;
 
 } // namespace API
 } // namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FuncMinimizerFactoryImpl>;
+}
+}
+
 /**
  * Macro for declaring a new type of minimizers to be used with the
  * FuncMinimizerFactory

Framework/API/inc/MantidAPI/FunctionFactory.h

@@ -142,13 +142,6 @@ const std::vector<std::string> &FunctionFactoryImpl::getFunctionNames() const {
   return typeNames;
 }
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>;
-#endif /* _WIN32 */
 typedef Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>
     FunctionFactory;
 
@@ -161,6 +154,12 @@ typedef const Poco::AutoPtr<FunctionFactoryUpdateNotification> &
 } // namespace API
 } // namespace Mantid
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FunctionFactoryImpl>;
+}
+}
+
 /**
  * Macro for declaring a new type of function to be used with the
  * FunctionFactory

Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h

@@ -64,18 +64,17 @@ private:
   ~ImplicitFunctionFactoryImpl() override = default;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// ImplicitFunctionFactoryImpl (needed for dllexport/dllimport) and a typedef
-/// for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<ImplicitFunctionFactoryImpl>;
-#endif /* _WIN32 */
 
 typedef Mantid::Kernel::SingletonHolder<
     ImplicitFunctionFactoryImpl> ImplicitFunctionFactory;
 }
 }
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::ImplicitFunctionFactoryImpl>;
+}
+}
+
+
 #endif

Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h

@@ -62,18 +62,16 @@ private:
   ~ImplicitFunctionParameterParserFactoryImpl() override = default;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// ImplicitFunctionFactoryImpl (needed for dllexport/dllimport) and a typedef
-/// for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>;
-#endif /* _WIN32 */
-
 typedef Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>
         ImplicitFunctionParameterParserFactory;
 }
 }
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL
+      Mantid::Kernel::SingletonHolder<Mantid::API::ImplicitFunctionParameterParserFactoryImpl>;
+}
+}
+
 #endif

Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h

@@ -66,18 +66,17 @@ private:
   ~ImplicitFunctionParserFactoryImpl() override = default;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// ImplicitFunctionFactoryImpl (needed for dllexport/dllimport) and a typedef
-/// for it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<ImplicitFunctionParserFactoryImpl>;
-#endif /* _WIN32 */
 
 typedef Mantid::Kernel::SingletonHolder<
     ImplicitFunctionParserFactoryImpl> ImplicitFunctionParserFactory;
 }
 }
 
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL
+      Mantid::Kernel::SingletonHolder<Mantid::API::ImplicitFunctionParserFactoryImpl>;
+}
+}
+
 #endif

Framework/API/inc/MantidAPI/InstrumentDataService.h

@@ -48,17 +48,17 @@ private:
   operator=(const InstrumentDataServiceImpl &) = delete;
 };
 
-/// Forward declaration of a specialisation of SingletonHolder for
-/// AnalysisDataServiceImpl (needed for dllexport/dllimport) and a typedef for
-/// it.
-#ifdef _WIN32
-// this breaks new namespace declaraion rules; need to find a better fix
-template class MANTID_API_DLL
-    Mantid::Kernel::SingletonHolder<InstrumentDataServiceImpl>;
-#endif /* _WIN32 */
 typedef Mantid::Kernel::SingletonHolder<
     InstrumentDataServiceImpl> InstrumentDataService;
 
 } // Namespace API
 } // Namespace Mantid
+
+namespace Mantid {
+namespace Kernel {
+  EXTERN_MANTID_API template class MANTID_API_DLL
+      Mantid::Kernel::SingletonHolder<Mantid::API::InstrumentDataServiceImpl>;
+}
+}
+
 #endif /*INSTRUMENTDATASERVICE_*/