From d3b88dd7147d83fb8003fa80fae1b04da4ad75b3 Mon Sep 17 00:00:00 2001
From: Anton Piccardo-Selg <anton.piccardo-selg@tessella.com>
Date: Thu, 2 Jun 2016 13:27:23 +0100
Subject: [PATCH] Refs #15283 Remove typdef with export macro
---
Framework/API/inc/MantidAPI/AlgorithmFactory.h | 2 +-
Framework/API/inc/MantidAPI/AnalysisDataService.h | 2 +-
Framework/API/inc/MantidAPI/ArchiveSearchFactory.h | 2 +-
Framework/API/inc/MantidAPI/CatalogFactory.h | 2 +-
Framework/API/inc/MantidAPI/CatalogManager.h | 2 +-
Framework/API/inc/MantidAPI/ColumnFactory.h | 2 +-
Framework/API/inc/MantidAPI/ConstraintFactory.h | 2 +-
Framework/API/inc/MantidAPI/CostFunctionFactory.h | 2 +-
Framework/API/inc/MantidAPI/DomainCreatorFactory.h | 2 +-
Framework/API/inc/MantidAPI/FileFinder.h | 2 +-
Framework/API/inc/MantidAPI/FileLoaderRegistry.h | 2 +-
Framework/API/inc/MantidAPI/FrameworkManager.h | 2 +-
Framework/API/inc/MantidAPI/FuncMinimizerFactory.h | 2 +-
Framework/API/inc/MantidAPI/FunctionFactory.h | 2 +-
.../API/inc/MantidAPI/ImplicitFunctionFactory.h | 2 +-
.../ImplicitFunctionParameterParserFactory.h | 3 +--
.../inc/MantidAPI/ImplicitFunctionParserFactory.h | 2 +-
Framework/API/inc/MantidAPI/InstrumentDataService.h | 2 +-
.../API/inc/MantidAPI/RemoteJobManagerFactory.h | 2 +-
.../API/inc/MantidAPI/ScriptRepositoryFactory.h | 2 +-
Framework/API/inc/MantidAPI/TransformScaleFactory.h | 2 +-
Framework/API/inc/MantidAPI/WorkspaceFactory.h | 2 +-
.../inc/MantidGeometry/Instrument/Parameter.h | 12 ++++++------
Framework/Kernel/inc/MantidKernel/ConfigService.h | 2 +-
Framework/Kernel/inc/MantidKernel/LibraryManager.h | 2 +-
.../inc/MantidKernel/PropertyManagerDataService.h | 2 +-
Framework/Kernel/inc/MantidKernel/ThreadPool.h | 2 +-
Framework/Kernel/inc/MantidKernel/UsageService.h | 2 +-
.../Quantification/ForegroundModelFactory.h | 3 +--
.../Quantification/MDResolutionConvolutionFactory.h | 2 +-
MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h | 2 +-
MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h | 4 ++--
.../inc/MantidQtAPI/SelectionNotificationService.h | 2 +-
33 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/Framework/API/inc/MantidAPI/AlgorithmFactory.h b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
index a9d7bb805be..3869d01863a 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmFactory.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
@@ -176,7 +176,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>
AlgorithmFactory;
/// Convenient typedef for an UpdateNotification
diff --git a/Framework/API/inc/MantidAPI/AnalysisDataService.h b/Framework/API/inc/MantidAPI/AnalysisDataService.h
index b99dfb0f5dd..d56ddcef2bd 100644
--- a/Framework/API/inc/MantidAPI/AnalysisDataService.h
+++ b/Framework/API/inc/MantidAPI/AnalysisDataService.h
@@ -186,7 +186,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>
+typedef Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>
AnalysisDataService;
typedef Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification
diff --git a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
index 78a4d211d36..875d6950d14 100644
--- a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
+++ b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
@@ -64,7 +64,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>
ArchiveSearchFactory;
}
}
diff --git a/Framework/API/inc/MantidAPI/CatalogFactory.h b/Framework/API/inc/MantidAPI/CatalogFactory.h
index 391bcf6753f..dc09ed9e263 100644
--- a/Framework/API/inc/MantidAPI/CatalogFactory.h
+++ b/Framework/API/inc/MantidAPI/CatalogFactory.h
@@ -85,7 +85,7 @@ template class MANTID_API_DLL
#endif /* _WIN32 */
/// The specialisation of the SingletonHolder class that holds the
/// CatalogFactory
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<CatalogFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<CatalogFactoryImpl>
CatalogFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/CatalogManager.h b/Framework/API/inc/MantidAPI/CatalogManager.h
index 7b8cf565a7b..05b65ebc794 100644
--- a/Framework/API/inc/MantidAPI/CatalogManager.h
+++ b/Framework/API/inc/MantidAPI/CatalogManager.h
@@ -70,7 +70,7 @@ private:
#ifdef _WIN32
template class MANTID_API_DLL Kernel::SingletonHolder<CatalogManagerImpl>;
#endif
-typedef MANTID_API_DLL Kernel::SingletonHolder<CatalogManagerImpl>
+typedef Kernel::SingletonHolder<CatalogManagerImpl>
CatalogManager;
}
}
diff --git a/Framework/API/inc/MantidAPI/ColumnFactory.h b/Framework/API/inc/MantidAPI/ColumnFactory.h
index 2d85aa07592..e17431b2d12 100644
--- a/Framework/API/inc/MantidAPI/ColumnFactory.h
+++ b/Framework/API/inc/MantidAPI/ColumnFactory.h
@@ -70,7 +70,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ColumnFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<ColumnFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<ColumnFactoryImpl>
ColumnFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/ConstraintFactory.h b/Framework/API/inc/MantidAPI/ConstraintFactory.h
index aa39886f793..1d18787c26e 100644
--- a/Framework/API/inc/MantidAPI/ConstraintFactory.h
+++ b/Framework/API/inc/MantidAPI/ConstraintFactory.h
@@ -79,7 +79,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>
ConstraintFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/CostFunctionFactory.h b/Framework/API/inc/MantidAPI/CostFunctionFactory.h
index c6675f363ff..b18865e0406 100644
--- a/Framework/API/inc/MantidAPI/CostFunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/CostFunctionFactory.h
@@ -70,7 +70,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>
CostFunctionFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
index d88d4212241..6cb63eaaa71 100644
--- a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
+++ b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
@@ -76,7 +76,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>
DomainCreatorFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/FileFinder.h b/Framework/API/inc/MantidAPI/FileFinder.h
index 7c52f42ca2b..80956529005 100644
--- a/Framework/API/inc/MantidAPI/FileFinder.h
+++ b/Framework/API/inc/MantidAPI/FileFinder.h
@@ -101,7 +101,7 @@ private:
template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<FileFinderImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FileFinderImpl>
+typedef Mantid::Kernel::SingletonHolder<FileFinderImpl>
FileFinder;
}
}
diff --git a/Framework/API/inc/MantidAPI/FileLoaderRegistry.h b/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
index 02fd7a228b4..18a300ac9f9 100644
--- a/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
+++ b/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
@@ -154,7 +154,7 @@ template class MANTID_API_DLL
#endif /* _WIN32 */
/// Type for the actual singleton instance
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>
+typedef Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>
FileLoaderRegistry;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/FrameworkManager.h b/Framework/API/inc/MantidAPI/FrameworkManager.h
index 762e00d14d0..2053bfa9750 100644
--- a/Framework/API/inc/MantidAPI/FrameworkManager.h
+++ b/Framework/API/inc/MantidAPI/FrameworkManager.h
@@ -142,7 +142,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<FrameworkManagerImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FrameworkManagerImpl>
+typedef Mantid::Kernel::SingletonHolder<FrameworkManagerImpl>
FrameworkManager;
} // namespace Kernel
diff --git a/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h b/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
index e8864ac53d0..850ce1c40d9 100644
--- a/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
+++ b/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
@@ -68,7 +68,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>
FuncMinimizerFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/FunctionFactory.h b/Framework/API/inc/MantidAPI/FunctionFactory.h
index 76a21ecdf0c..0b708712df1 100644
--- a/Framework/API/inc/MantidAPI/FunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/FunctionFactory.h
@@ -149,7 +149,7 @@ const std::vector<std::string> &FunctionFactoryImpl::getFunctionNames() const {
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>
FunctionFactory;
/// Convenient typedef for an UpdateNotification
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
index c0083dc3a61..55e0fa2f193 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
@@ -73,7 +73,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ImplicitFunctionFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
ImplicitFunctionFactoryImpl> ImplicitFunctionFactory;
}
}
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
index f7722e5d9f2..07bfe824373 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
@@ -71,8 +71,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL
- Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>
ImplicitFunctionParameterParserFactory;
}
}
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
index 703dafa5b12..8da39a8f65f 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
@@ -75,7 +75,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ImplicitFunctionParserFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
ImplicitFunctionParserFactoryImpl> ImplicitFunctionParserFactory;
}
}
diff --git a/Framework/API/inc/MantidAPI/InstrumentDataService.h b/Framework/API/inc/MantidAPI/InstrumentDataService.h
index c4d5a2d4cf4..5c7040c63ee 100644
--- a/Framework/API/inc/MantidAPI/InstrumentDataService.h
+++ b/Framework/API/inc/MantidAPI/InstrumentDataService.h
@@ -56,7 +56,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<InstrumentDataServiceImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
InstrumentDataServiceImpl> InstrumentDataService;
} // Namespace API
diff --git a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
index 814981add05..8718622b4fe 100644
--- a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
+++ b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
@@ -95,7 +95,7 @@ template class MANTID_API_DLL
#endif /* _WIN32 */
// The factory is just a specialisation of SingletonHolder
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
RemoteJobManagerFactoryImpl> RemoteJobManagerFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
index 61886bebd0d..e8d098323f3 100644
--- a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
+++ b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
@@ -74,7 +74,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ScriptRepositoryFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
ScriptRepositoryFactoryImpl> ScriptRepositoryFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/TransformScaleFactory.h b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
index e2101893d4c..d7913f74653 100644
--- a/Framework/API/inc/MantidAPI/TransformScaleFactory.h
+++ b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
@@ -75,7 +75,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<TransformScaleFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
TransformScaleFactoryImpl> TransformScaleFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/WorkspaceFactory.h b/Framework/API/inc/MantidAPI/WorkspaceFactory.h
index 503c64c29c6..3dc53497f9a 100644
--- a/Framework/API/inc/MantidAPI/WorkspaceFactory.h
+++ b/Framework/API/inc/MantidAPI/WorkspaceFactory.h
@@ -105,7 +105,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<WorkspaceFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<WorkspaceFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<WorkspaceFactoryImpl>
WorkspaceFactory;
} // namespace Kernel
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
index c1ae2f418e7..7d350f34c1b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
@@ -237,17 +237,17 @@ ParameterType<Type> &ParameterType<Type>::operator=(const Type &value) {
/// Typedef for the shared pointer
typedef boost::shared_ptr<Parameter> Parameter_sptr;
/// Parameter of type int
-typedef MANTID_GEOMETRY_DLL ParameterType<int> ParameterInt;
+typedef ParameterType<int> ParameterInt;
/// Parameter of type double
-typedef MANTID_GEOMETRY_DLL ParameterType<double> ParameterDouble;
+typedef ParameterType<double> ParameterDouble;
/// Parameter of type bool
-typedef MANTID_GEOMETRY_DLL ParameterType<bool> ParameterBool;
+typedef ParameterType<bool> ParameterBool;
/// Parameter of type std::string
-typedef MANTID_GEOMETRY_DLL ParameterType<std::string> ParameterString;
+typedef ParameterType<std::string> ParameterString;
/// Parameter of type V3D
-typedef MANTID_GEOMETRY_DLL ParameterType<Kernel::V3D> ParameterV3D;
+typedef ParameterType<Kernel::V3D> ParameterV3D;
/// Parameter of type Quat
-typedef MANTID_GEOMETRY_DLL ParameterType<Kernel::Quat> ParameterQuat;
+typedef ParameterType<Kernel::Quat> ParameterQuat;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Framework/Kernel/inc/MantidKernel/ConfigService.h
index 2ca272f36d9..616f5cb3936 100644
--- a/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -359,7 +359,7 @@ inline
#endif
template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<ConfigServiceImpl>;
-typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<ConfigServiceImpl>
+typedef Mantid::Kernel::SingletonHolder<ConfigServiceImpl>
ConfigService;
typedef Mantid::Kernel::ConfigServiceImpl::ValueChanged
diff --git a/Framework/Kernel/inc/MantidKernel/LibraryManager.h b/Framework/Kernel/inc/MantidKernel/LibraryManager.h
index de77712ad2f..089038d0c08 100644
--- a/Framework/Kernel/inc/MantidKernel/LibraryManager.h
+++ b/Framework/Kernel/inc/MantidKernel/LibraryManager.h
@@ -76,7 +76,7 @@ inline
#endif
template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<LibraryManagerImpl>;
-typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<LibraryManagerImpl>
+typedef Mantid::Kernel::SingletonHolder<LibraryManagerImpl>
LibraryManager;
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
index 49aa7c28a21..46d3d0b9513 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
@@ -54,7 +54,7 @@ private:
template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<PropertyManagerDataServiceImpl>;
#endif /* _WIN32 */
-typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
PropertyManagerDataServiceImpl> PropertyManagerDataService;
} // Namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/ThreadPool.h b/Framework/Kernel/inc/MantidKernel/ThreadPool.h
index c383d334d1b..256eacf6b68 100644
--- a/Framework/Kernel/inc/MantidKernel/ThreadPool.h
+++ b/Framework/Kernel/inc/MantidKernel/ThreadPool.h
@@ -93,7 +93,7 @@ private:
// template class MANTID_KERNEL_DLL
// Mantid::Kernel::SingletonHolder<ThreadPoolImpl>;
//#endif /* _WIN32 */
-// typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<ThreadPoolImpl>
+// typedef Mantid::Kernel::SingletonHolder<ThreadPoolImpl>
// ThreadPool;
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/UsageService.h b/Framework/Kernel/inc/MantidKernel/UsageService.h
index f77ba2d5a15..b3b461118e2 100644
--- a/Framework/Kernel/inc/MantidKernel/UsageService.h
+++ b/Framework/Kernel/inc/MantidKernel/UsageService.h
@@ -144,7 +144,7 @@ inline
#endif
template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<UsageServiceImpl>;
-typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<UsageServiceImpl>
+typedef Mantid::Kernel::SingletonHolder<UsageServiceImpl>
UsageService;
} // namespace API
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
index 5bb9e80788b..04380c802fd 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
@@ -72,8 +72,7 @@ template class MANTID_MDALGORITHMS_DLL
Kernel::SingletonHolder<ForegroundModelFactoryImpl>;
#endif /* _WIN32 */
/// Typedef singleton instance to ForegroundFactory
-typedef MANTID_MDALGORITHMS_DLL
- Kernel::SingletonHolder<ForegroundModelFactoryImpl> ForegroundModelFactory;
+typedef Kernel::SingletonHolder<ForegroundModelFactoryImpl> ForegroundModelFactory;
}
}
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
index 005d9af1314..2d1b8750ea4 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
@@ -71,7 +71,7 @@ template class MANTID_MDALGORITHMS_DLL
Kernel::SingletonHolder<MDResolutionConvolutionFactoryImpl>;
#endif /* _WIN32 */
/// Typedef singleton instance to MDResolutionConvolutionFactory
-typedef MANTID_MDALGORITHMS_DLL Kernel::SingletonHolder<
+typedef Kernel::SingletonHolder<
MDResolutionConvolutionFactoryImpl> MDResolutionConvolutionFactory;
}
}
diff --git a/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h b/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h
index 6add232669d..794db1cc8cc 100644
--- a/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h
+++ b/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h
@@ -98,7 +98,7 @@ private:
template class EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<AlgorithmInputHistoryImpl>;
#endif /* _WIN32 */
/// The specific instantiation of the templated type
- typedef EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<AlgorithmInputHistoryImpl> AlgorithmInputHistory;
+ typedef Mantid::Kernel::SingletonHolder<AlgorithmInputHistoryImpl> AlgorithmInputHistory;
}
}
diff --git a/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h b/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h
index 7fce6d1c919..694792b5f45 100644
--- a/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h
+++ b/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h
@@ -75,7 +75,7 @@ template class EXPORT_OPT_MANTIDQT_API
Mantid::Kernel::SingletonHolder<AlgorithmDialogFactoryImpl>;
#endif /* _WIN32 */
/// The specific instantiation of the templated type
-typedef EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
AlgorithmDialogFactoryImpl> AlgorithmDialogFactory;
/**
@@ -190,7 +190,7 @@ template class EXPORT_OPT_MANTIDQT_API
Mantid::Kernel::SingletonHolder<UserSubWindowFactoryImpl>;
#endif /* _WIN32 */
/// The specific instantiation of the templated type
-typedef EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
UserSubWindowFactoryImpl> UserSubWindowFactory;
}
}
diff --git a/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h b/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h
index be793d990e5..3566bf08d26 100644
--- a/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h
+++ b/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h
@@ -70,7 +70,7 @@ namespace MantidQt
template class EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<SelectionNotificationServiceImpl>;
#endif /* _WIN32 */
- typedef EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<SelectionNotificationServiceImpl> SelectionNotificationService;
+ typedef Mantid::Kernel::SingletonHolder<SelectionNotificationServiceImpl> SelectionNotificationService;
}
}
--
GitLab