Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
491cdff3
Commit
491cdff3
authored
Oct 23, 2017
by
Lamar Moore
Browse files
Fix GET_POINTER_SPECIALIZATION issue re #20598
parent
f30e90af
Changes
8
Hide whitespace changes
Inline
Side-by-side
Framework/PythonInterface/inc/MantidPythonInterface/kernel/GetPointer.h
View file @
491cdff3
#ifndef MANTID_PYTHONINTERFACE_KERNEL_GETPOINTER_H_
#define MANTID_PYTHONINTERFACE_KERNEL_GETPOINTER_H_
#if defined(_MSC_FULL_VER) && _MSC_FULL_VER > 190023918
#if defined(_MSC_FULL_VER) && _MSC_FULL_VER > 190023918 && \
_MSC_FULL_VER < 191125506
// Visual Studio Update 3 refuses to link boost python exports that use
// register_ptr_to_python with a virtual base. This is a work around
#define GET_POINTER_SPECIALIZATION(TYPE) \
...
...
Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
View file @
491cdff3
...
...
@@ -24,7 +24,7 @@ using Mantid::Kernel::Unit_sptr;
using
Mantid
::
specnum_t
;
using
namespace
boost
::
python
;
//
GET_POINTER_SPECIALIZATION(Axis)
GET_POINTER_SPECIALIZATION
(
Axis
)
namespace
{
namespace
bpl
=
boost
::
python
;
...
...
Framework/PythonInterface/mantid/api/src/Exports/IEventList.cpp
View file @
491cdff3
...
...
@@ -16,7 +16,7 @@ namespace Policies = Mantid::PythonInterface::Policies;
namespace
Converters
=
Mantid
::
PythonInterface
::
Converters
;
using
namespace
boost
::
python
;
//
GET_POINTER_SPECIALIZATION(IEventList)
GET_POINTER_SPECIALIZATION
(
IEventList
)
/// return_value_policy for copied numpy array
typedef
return_value_policy
<
Policies
::
VectorToNumpy
>
return_clone_numpy
;
...
...
Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
View file @
491cdff3
...
...
@@ -8,7 +8,7 @@
using
Mantid
::
Geometry
::
IPeak
;
using
namespace
boost
::
python
;
//
GET_POINTER_SPECIALIZATION(IPeak)
GET_POINTER_SPECIALIZATION
(
IPeak
)
namespace
{
using
namespace
Mantid
::
PythonInterface
;
...
...
Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
View file @
491cdff3
...
...
@@ -8,7 +8,7 @@ using Mantid::API::ISpectrum;
using
Mantid
::
detid_t
;
using
namespace
boost
::
python
;
//
GET_POINTER_SPECIALIZATION(ISpectrum)
GET_POINTER_SPECIALIZATION
(
ISpectrum
)
void
export_ISpectrum
()
{
register_ptr_to_python
<
ISpectrum
*>
();
...
...
Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
View file @
491cdff3
...
...
@@ -16,7 +16,7 @@ using Mantid::Kernel::Property;
using
namespace
boost
::
python
;
GET_POINTER_SPECIALIZATION
(
Goniometer
)
//
GET_POINTER_SPECIALIZATION(Run)
GET_POINTER_SPECIALIZATION
(
Run
)
namespace
{
namespace
bpl
=
boost
::
python
;
...
...
Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
View file @
491cdff3
...
...
@@ -15,7 +15,7 @@ using Mantid::API::WorkspaceHistory;
using
namespace
boost
::
python
;
namespace
Policies
=
Mantid
::
PythonInterface
::
Policies
;
//
GET_POINTER_SPECIALIZATION(WorkspaceHistory)
GET_POINTER_SPECIALIZATION
(
WorkspaceHistory
)
/**
* Return a Python list of history objects from the workspace history as this is
...
...
Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManager.cpp
View file @
491cdff3
...
...
@@ -18,7 +18,7 @@ using Mantid::Kernel::PropertyManager_sptr;
using
namespace
boost
::
python
;
//
GET_POINTER_SPECIALIZATION(PropertyManager)
GET_POINTER_SPECIALIZATION
(
PropertyManager
)
void
export_PropertyManager
()
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment