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
6f531097
Commit
6f531097
authored
Sep 22, 2017
by
LamarMoore
Committed by
Lamar Moore
Oct 06, 2017
Browse files
fix msvc 2017 compiler errors #20598
parent
d540335e
Changes
13
Hide whitespace changes
Inline
Side-by-side
Framework/API/test/FunctionAttributeTest.h
View file @
6f531097
...
...
@@ -11,7 +11,6 @@
using
namespace
Mantid
;
using
namespace
Mantid
::
API
;
namespace
{
class
IFT_Funct
:
public
ParamFunction
,
public
IFunction1D
{
public:
IFT_Funct
()
{
...
...
@@ -35,7 +34,6 @@ public:
DECLARE_FUNCTION
(
IFT_Funct
)
}
// namespace
class
FunctionAttributeTest
:
public
CxxTest
::
TestSuite
{
public:
...
...
Framework/API/test/MultiPeriodGroupWorkerTest.h
View file @
6f531097
...
...
@@ -12,7 +12,6 @@
using
Mantid
::
API
::
MultiPeriodGroupWorker
;
using
namespace
Mantid
::
API
;
namespace
{
class
TestAlgorithm
:
public
Algorithm
{
public:
TestAlgorithm
()
{}
...
...
@@ -32,7 +31,7 @@ public:
~
TestAlgorithm
()
override
{}
};
DECLARE_ALGORITHM
(
TestAlgorithm
)
}
class
MultiPeriodGroupWorkerTest
:
public
CxxTest
::
TestSuite
,
public
MultiPeriodGroupTestBase
{
...
...
Framework/Algorithms/src/DiffractionFocussing2.cpp
View file @
6f531097
...
...
@@ -307,9 +307,9 @@ void DiffractionFocussing2::exec() {
std
::
divides
<
double
>
());
// Now multiply by the number of spectra in the group
std
::
transform
(
Yout
.
begin
(),
Yout
.
end
(),
Yout
.
begin
(),
std
::
bind2nd
(
std
::
multiplies
<
double
>
(),
groupSize
));
std
::
bind2nd
(
std
::
multiplies
<
double
>
(),
static_cast
<
double
>
(
groupSize
))
)
;
std
::
transform
(
Eout
.
begin
(),
Eout
.
end
(),
Eout
.
begin
(),
std
::
bind2nd
(
std
::
multiplies
<
double
>
(),
groupSize
));
std
::
bind2nd
(
std
::
multiplies
<
double
>
(),
static_cast
<
double
>
(
groupSize
))
)
;
prog
->
report
();
PARALLEL_END_INTERUPT_REGION
...
...
Framework/CurveFitting/test/Algorithms/FitTest.h
View file @
6f531097
...
...
@@ -32,7 +32,6 @@ using namespace Mantid::DataObjects;
using
Mantid
::
TestHelpers
::
MultiDomainFunctionTest_Function
;
namespace
{
class
TestMinimizer
:
public
API
::
IFuncMinimizer
{
public:
/// Constructor setting a value for the relative error acceptance
...
...
@@ -75,7 +74,7 @@ private:
};
DECLARE_FUNCMINIMIZER
(
TestMinimizer
,
TestMinimizer
)
}
class
FitTest
:
public
CxxTest
::
TestSuite
{
public:
...
...
Framework/CurveFitting/test/Algorithms/PlotPeakByLogValueTest.h
View file @
6f531097
...
...
@@ -36,7 +36,6 @@ using Mantid::HistogramData::LinearGenerator;
typedef
Mantid
::
DataObjects
::
Workspace2D_sptr
WS_type
;
typedef
Mantid
::
DataObjects
::
TableWorkspace_sptr
TWS_type
;
namespace
{
struct
Fun
{
double
operator
()(
double
,
int
i
)
{
return
double
(
i
+
1
);
}
};
...
...
@@ -72,7 +71,6 @@ public:
private:
std
::
string
m_name
;
};
}
class
PlotPeak_Expression
{
public:
...
...
Framework/Kernel/test/TypedValidatorTest.h
View file @
6f531097
...
...
@@ -7,7 +7,7 @@
#include
<boost/make_shared.hpp>
#include
<cxxtest/TestSuite.h>
namespace
{
#define DECLARE_TEST_VALIDATOR(ClassName, HeldType) \
class ClassName : public Mantid::Kernel::TypedValidator<HeldType> { \
public: \
...
...
@@ -33,7 +33,6 @@ private:
};
DECLARE_TEST_VALIDATOR
(
DataItemSptrTypedValidator
,
boost
::
shared_ptr
<
FakeDataItem
>
)
}
class
TypedValidatorTest
:
public
CxxTest
::
TestSuite
{
public:
...
...
Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
View file @
6f531097
...
...
@@ -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 @
6f531097
...
...
@@ -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 @
6f531097
...
...
@@ -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 @
6f531097
...
...
@@ -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 @
6f531097
...
...
@@ -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 @
6f531097
...
...
@@ -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 @
6f531097
...
...
@@ -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