Skip to content
Snippets Groups Projects
Commit dbaa7b65 authored by Russell Taylor's avatar Russell Taylor
Browse files

Added missing DLLExports. Re #55.

parent 61d63fad
No related branches found
No related tags found
No related merge requests found
......@@ -39,7 +39,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="inc;../Kernel/inc;../Geometry/inc;../../Third_Party/include;C:\python25\include"
AdditionalIncludeDirectories="inc;../Kernel/inc;../DataObjects/inc;../Geometry/inc;../../Third_Party/include;C:\python25\include"
RuntimeLibrary="3"
DebugInformationFormat="3"
/>
......@@ -169,10 +169,6 @@
RelativePath=".\src\AnalysisDataService.cpp"
>
</File>
<File
RelativePath=".\src\BoostPythonWrapper.cpp"
>
</File>
<File
RelativePath=".\src\FrameworkManager.cpp"
>
......@@ -201,10 +197,6 @@
RelativePath=".\src\WorkspaceFactory.cpp"
>
</File>
<File
RelativePath=".\src\WorkspaceProperty.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
......
......@@ -101,7 +101,7 @@ namespace Mantid
{
namespace Kernel
{
template<>
template<> DLLExport
Mantid::API::Workspace* PropertyManager::getValue<Mantid::API::Workspace*>(const std::string &name) const
{
PropertyWithValue<Mantid::API::Workspace*> *prop =
......
......@@ -75,7 +75,7 @@ namespace Mantid
{
namespace Kernel
{
template<>
template<> DLLExport
Mantid::DataObjects::Workspace1D* PropertyManager::getValue<Mantid::DataObjects::Workspace1D*>(const std::string &name) const
{
PropertyWithValue<Mantid::DataObjects::Workspace1D*> *prop =
......
......@@ -297,7 +297,7 @@ namespace Mantid
{
namespace Kernel
{
template<>
template<> DLLExport
Mantid::DataObjects::Workspace2D* PropertyManager::getValue<Mantid::DataObjects::Workspace2D*>(const std::string &name) const
{
PropertyWithValue<Mantid::DataObjects::Workspace2D*> *prop =
......
......@@ -167,7 +167,7 @@ const std::vector< Property* >& PropertyManager::getProperties() const
}
/// @cond
template<>
template<> DLLExport
int PropertyManager::getValue<int>(const std::string &name) const
{
PropertyWithValue<int> *prop = dynamic_cast<PropertyWithValue<int>*>(getPointerToProperty(name));
......@@ -181,7 +181,7 @@ int PropertyManager::getValue<int>(const std::string &name) const
}
}
template<>
template<> DLLExport
double PropertyManager::getValue<double>(const std::string &name) const
{
PropertyWithValue<double> *prop = dynamic_cast<PropertyWithValue<double>*>(getPointerToProperty(name));
......@@ -195,14 +195,14 @@ double PropertyManager::getValue<double>(const std::string &name) const
}
}
template <>
template <> DLLExport
std::string PropertyManager::getValue<std::string>(const std::string &name) const
{
Property *p = getPointerToProperty(name); // throws NotFoundError if property not in vector
return p->value();
}
template <>
template <> DLLExport
Property* PropertyManager::getValue(const std::string &name) const
{
return getPointerToProperty(name);
......
......@@ -6,6 +6,7 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Algorithms", "Algorithms\Algorithms.vcproj", "{44AAB5BE-B672-4B26-A472-1FC3FFB896AF}"
ProjectSection(ProjectDependencies) = postProject
{902CB04F-8893-4FE8-83B8-09F9DB20A82A} = {902CB04F-8893-4FE8-83B8-09F9DB20A82A}
{F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
{AD0CD585-694E-4367-B7D0-2F16C4EF59F8} = {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}
{C38A9DC2-8320-49AA-909D-955CB37FD8F3} = {C38A9DC2-8320-49AA-909D-955CB37FD8F3}
EndProjectSection
......@@ -20,19 +21,19 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataHandling", "DataHandling\DataHandling.vcproj", "{296392B7-E931-4821-A68D-3412E7DD554A}"
ProjectSection(ProjectDependencies) = postProject
{902CB04F-8893-4FE8-83B8-09F9DB20A82A} = {902CB04F-8893-4FE8-83B8-09F9DB20A82A}
{F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
{AD0CD585-694E-4367-B7D0-2F16C4EF59F8} = {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}
{C38A9DC2-8320-49AA-909D-955CB37FD8F3} = {C38A9DC2-8320-49AA-909D-955CB37FD8F3}
{F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Main", "Main\Main.vcproj", "{8214A04F-8650-49FC-8547-FD2716855980}"
ProjectSection(ProjectDependencies) = postProject
{902CB04F-8893-4FE8-83B8-09F9DB20A82A} = {902CB04F-8893-4FE8-83B8-09F9DB20A82A}
{F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
{AD0CD585-694E-4367-B7D0-2F16C4EF59F8} = {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}
{C38A9DC2-8320-49AA-909D-955CB37FD8F3} = {C38A9DC2-8320-49AA-909D-955CB37FD8F3}
{44AAB5BE-B672-4B26-A472-1FC3FFB896AF} = {44AAB5BE-B672-4B26-A472-1FC3FFB896AF}
{296392B7-E931-4821-A68D-3412E7DD554A} = {296392B7-E931-4821-A68D-3412E7DD554A}
{F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
{44AAB5BE-B672-4B26-A472-1FC3FFB896AF} = {44AAB5BE-B672-4B26-A472-1FC3FFB896AF}
{C38A9DC2-8320-49AA-909D-955CB37FD8F3} = {C38A9DC2-8320-49AA-909D-955CB37FD8F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "Geometry\Geometry.vcproj", "{F1EB475D-8936-49E5-AC28-3B3830483487}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment