From 1c9158c853b5e462dbe271945b3dccc8fd16f161 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Mon, 22 Feb 2016 11:38:26 +0100
Subject: [PATCH] PythonAPI regenerated
---
Core/PythonAPI/src/ConstKBinAxis.pypp.cpp | 36 +--
Core/PythonAPI/src/CustomBinAxis.pypp.cpp | 24 +-
.../src/FormFactorAnisoPyramid.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorBox.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorCone.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorCone6.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorCrystal.pypp.cpp | 8 +-
.../src/FormFactorCuboctahedron.pypp.cpp | 8 +-
.../PythonAPI/src/FormFactorCylinder.pypp.cpp | 8 +-
.../FormFactorDecoratorDebyeWaller.pypp.cpp | 8 +-
.../FormFactorEllipsoidalCylinder.pypp.cpp | 8 +-
.../src/FormFactorFullSphere.pypp.cpp | 8 +-
.../src/FormFactorFullSpheroid.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorGauss.pypp.cpp | 8 +-
.../src/FormFactorHemiEllipsoid.pypp.cpp | 8 +-
.../src/FormFactorLongBoxGauss.pypp.cpp | 8 +-
.../src/FormFactorLongBoxLorentz.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorLorentz.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorPrism3.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorPrism6.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorPyramid.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorRipple1.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorRipple2.pypp.cpp | 8 +-
.../FormFactorSphereGaussianRadius.pypp.cpp | 8 +-
.../FormFactorSphereLogNormalRadius.pypp.cpp | 8 +-
.../FormFactorSphereUniformRadius.pypp.cpp | 8 +-
.../src/FormFactorTetrahedron.pypp.cpp | 8 +-
Core/PythonAPI/src/FormFactorTrivial.pypp.cpp | 8 +-
.../src/FormFactorTruncatedCube.pypp.cpp | 8 +-
.../src/FormFactorTruncatedSphere.pypp.cpp | 8 +-
.../src/FormFactorTruncatedSpheroid.pypp.cpp | 8 +-
.../PythonAPI/src/FormFactorWeighted.pypp.cpp | 8 +-
Core/PythonAPI/src/IAxis.pypp.cpp | 20 +-
Core/PythonAPI/src/IFormFactor.pypp.cpp | 8 +-
Core/PythonAPI/src/IFormFactorBorn.pypp.cpp | 8 +-
.../src/IFormFactorDecorator.pypp.cpp | 8 +-
.../src/IInterferenceFunction.pypp.cpp | 8 +-
Core/PythonAPI/src/IRotation.pypp.cpp | 8 +-
Core/PythonAPI/src/ISample.pypp.cpp | 8 +-
.../InterferenceFunction1DLattice.pypp.cpp | 8 +-
.../InterferenceFunction2DLattice.pypp.cpp | 8 +-
...InterferenceFunction2DParaCrystal.pypp.cpp | 8 +-
.../src/InterferenceFunctionNone.pypp.cpp | 8 +-
...rferenceFunctionRadialParaCrystal.pypp.cpp | 8 +-
Core/PythonAPI/src/LayerRoughness.pypp.cpp | 8 +-
Core/PythonAPI/src/ParameterPool.pypp.cpp | 2 +-
Core/PythonAPI/src/PythonListConverter.cpp | 2 +-
Core/PythonAPI/src/PythonModule.cpp | 270 +++++++++---------
Core/PythonAPI/src/RotationEuler.pypp.cpp | 8 +-
Core/PythonAPI/src/RotationX.pypp.cpp | 8 +-
Core/PythonAPI/src/RotationY.pypp.cpp | 8 +-
Core/PythonAPI/src/RotationZ.pypp.cpp | 8 +-
Core/PythonAPI/src/VariableBinAxis.pypp.cpp | 44 +--
Fit/PythonAPI/src/PythonModule.cpp | 44 +--
GUI/coregui/Models/FitModel.cpp | 1 +
GUI/coregui/Models/RectangularDetectorItem.h | 2 +-
GUI/coregui/Models/VectorItem.h | 2 +-
57 files changed, 408 insertions(+), 407 deletions(-)
diff --git a/Core/PythonAPI/src/ConstKBinAxis.pypp.cpp b/Core/PythonAPI/src/ConstKBinAxis.pypp.cpp
index fb65d930ee7..def92790983 100644
--- a/Core/PythonAPI/src/ConstKBinAxis.pypp.cpp
+++ b/Core/PythonAPI/src/ConstKBinAxis.pypp.cpp
@@ -28,7 +28,7 @@ namespace bp = boost::python;
struct ConstKBinAxis_wrapper : ConstKBinAxis, bp::wrapper< ConstKBinAxis > {
- ConstKBinAxis_wrapper(::std::string const & name, ::std::size_t nbins, double start, double end )
+ ConstKBinAxis_wrapper(::std::string const & name, ::size_t nbins, double start, double end )
: ConstKBinAxis( name, nbins, start, end )
, bp::wrapper< ConstKBinAxis >(){
// constructor
@@ -83,7 +83,7 @@ struct ConstKBinAxis_wrapper : ConstKBinAxis, bp::wrapper< ConstKBinAxis > {
return IAxis::createDoubleBinSize( );
}
- virtual ::std::size_t findClosestIndex( double value ) const {
+ virtual ::size_t findClosestIndex( double value ) const {
if( bp::override func_findClosestIndex = this->get_override( "findClosestIndex" ) )
return func_findClosestIndex( value );
else{
@@ -91,11 +91,11 @@ struct ConstKBinAxis_wrapper : ConstKBinAxis, bp::wrapper< ConstKBinAxis > {
}
}
- ::std::size_t default_findClosestIndex( double value ) const {
+ ::size_t default_findClosestIndex( double value ) const {
return VariableBinAxis::findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::std::size_t index ) const {
+ virtual ::Bin1D getBin( ::size_t index ) const {
if( bp::override func_getBin = this->get_override( "getBin" ) )
return func_getBin( index );
else{
@@ -103,7 +103,7 @@ struct ConstKBinAxis_wrapper : ConstKBinAxis, bp::wrapper< ConstKBinAxis > {
}
}
- ::Bin1D default_getBin( ::std::size_t index ) const {
+ ::Bin1D default_getBin( ::size_t index ) const {
return VariableBinAxis::getBin( index );
}
@@ -119,7 +119,7 @@ struct ConstKBinAxis_wrapper : ConstKBinAxis, bp::wrapper< ConstKBinAxis > {
return VariableBinAxis::getBinBoundaries( );
}
- virtual double getBinCenter( ::std::size_t index ) const {
+ virtual double getBinCenter( ::size_t index ) const {
if( bp::override func_getBinCenter = this->get_override( "getBinCenter" ) )
return func_getBinCenter( index );
else{
@@ -127,7 +127,7 @@ struct ConstKBinAxis_wrapper : ConstKBinAxis, bp::wrapper< ConstKBinAxis > {
}
}
- double default_getBinCenter( ::std::size_t index ) const {
+ double default_getBinCenter( ::size_t index ) const {
return VariableBinAxis::getBinCenter( index );
}
@@ -167,7 +167,7 @@ struct ConstKBinAxis_wrapper : ConstKBinAxis, bp::wrapper< ConstKBinAxis > {
return VariableBinAxis::getMin( );
}
- virtual ::std::size_t getSize( ) const {
+ virtual ::size_t getSize( ) const {
if( bp::override func_getSize = this->get_override( "getSize" ) )
return func_getSize( );
else{
@@ -175,7 +175,7 @@ struct ConstKBinAxis_wrapper : ConstKBinAxis, bp::wrapper< ConstKBinAxis > {
}
}
- ::std::size_t default_getSize( ) const {
+ ::size_t default_getSize( ) const {
return VariableBinAxis::getSize( );
}
@@ -187,7 +187,7 @@ void register_ConstKBinAxis_class(){
{ //::ConstKBinAxis
typedef bp::class_< ConstKBinAxis_wrapper, bp::bases< VariableBinAxis >, std::auto_ptr< ConstKBinAxis_wrapper >, boost::noncopyable > ConstKBinAxis_exposer_t;
- ConstKBinAxis_exposer_t ConstKBinAxis_exposer = ConstKBinAxis_exposer_t( "ConstKBinAxis", "Axis with fixed bin size in sin(angle) space.", bp::init< std::string const &, std::size_t, double, double >(( bp::arg("name"), bp::arg("nbins"), bp::arg("start"), bp::arg("end") ), "ConstKBinAxis constructor.\n\n:Parameters:\n - 'name' - Axis name\n - 'nbins' - number of bins\n - 'start' - low edge of first bin\n - 'end' - upper edge of last bin\n") );
+ ConstKBinAxis_exposer_t ConstKBinAxis_exposer = ConstKBinAxis_exposer_t( "ConstKBinAxis", "Axis with fixed bin size in sin(angle) space.", bp::init< std::string const &, size_t, double, double >(( bp::arg("name"), bp::arg("nbins"), bp::arg("start"), bp::arg("end") ), "ConstKBinAxis constructor.\n\n:Parameters:\n - 'name' - Axis name\n - 'nbins' - number of bins\n - 'start' - low edge of first bin\n - 'end' - upper edge of last bin\n") );
bp::scope ConstKBinAxis_scope( ConstKBinAxis_exposer );
{ //::ConstKBinAxis::clone
@@ -240,8 +240,8 @@ void register_ConstKBinAxis_class(){
}
{ //::VariableBinAxis::findClosestIndex
- typedef ::std::size_t ( ::VariableBinAxis::*findClosestIndex_function_type)( double ) const;
- typedef ::std::size_t ( ConstKBinAxis_wrapper::*default_findClosestIndex_function_type)( double ) const;
+ typedef ::size_t ( ::VariableBinAxis::*findClosestIndex_function_type)( double ) const;
+ typedef ::size_t ( ConstKBinAxis_wrapper::*default_findClosestIndex_function_type)( double ) const;
ConstKBinAxis_exposer.def(
"findClosestIndex"
@@ -252,8 +252,8 @@ void register_ConstKBinAxis_class(){
}
{ //::VariableBinAxis::getBin
- typedef ::Bin1D ( ::VariableBinAxis::*getBin_function_type)( ::std::size_t ) const;
- typedef ::Bin1D ( ConstKBinAxis_wrapper::*default_getBin_function_type)( ::std::size_t ) const;
+ typedef ::Bin1D ( ::VariableBinAxis::*getBin_function_type)( ::size_t ) const;
+ typedef ::Bin1D ( ConstKBinAxis_wrapper::*default_getBin_function_type)( ::size_t ) const;
ConstKBinAxis_exposer.def(
"getBin"
@@ -275,8 +275,8 @@ void register_ConstKBinAxis_class(){
}
{ //::VariableBinAxis::getBinCenter
- typedef double ( ::VariableBinAxis::*getBinCenter_function_type)( ::std::size_t ) const;
- typedef double ( ConstKBinAxis_wrapper::*default_getBinCenter_function_type)( ::std::size_t ) const;
+ typedef double ( ::VariableBinAxis::*getBinCenter_function_type)( ::size_t ) const;
+ typedef double ( ConstKBinAxis_wrapper::*default_getBinCenter_function_type)( ::size_t ) const;
ConstKBinAxis_exposer.def(
"getBinCenter"
@@ -320,8 +320,8 @@ void register_ConstKBinAxis_class(){
}
{ //::VariableBinAxis::getSize
- typedef ::std::size_t ( ::VariableBinAxis::*getSize_function_type)( ) const;
- typedef ::std::size_t ( ConstKBinAxis_wrapper::*default_getSize_function_type)( ) const;
+ typedef ::size_t ( ::VariableBinAxis::*getSize_function_type)( ) const;
+ typedef ::size_t ( ConstKBinAxis_wrapper::*default_getSize_function_type)( ) const;
ConstKBinAxis_exposer.def(
"getSize"
diff --git a/Core/PythonAPI/src/CustomBinAxis.pypp.cpp b/Core/PythonAPI/src/CustomBinAxis.pypp.cpp
index 61099c7d5c9..1f3f4923fc2 100644
--- a/Core/PythonAPI/src/CustomBinAxis.pypp.cpp
+++ b/Core/PythonAPI/src/CustomBinAxis.pypp.cpp
@@ -107,7 +107,7 @@ struct CustomBinAxis_wrapper : CustomBinAxis, bp::wrapper< CustomBinAxis > {
return IAxis::createDoubleBinSize( );
}
- virtual ::std::size_t findClosestIndex( double value ) const {
+ virtual ::size_t findClosestIndex( double value ) const {
if( bp::override func_findClosestIndex = this->get_override( "findClosestIndex" ) )
return func_findClosestIndex( value );
else{
@@ -115,7 +115,7 @@ struct CustomBinAxis_wrapper : CustomBinAxis, bp::wrapper< CustomBinAxis > {
}
}
- ::std::size_t default_findClosestIndex( double value ) const {
+ ::size_t default_findClosestIndex( double value ) const {
return VariableBinAxis::findClosestIndex( value );
}
@@ -131,7 +131,7 @@ struct CustomBinAxis_wrapper : CustomBinAxis, bp::wrapper< CustomBinAxis > {
return VariableBinAxis::getBinBoundaries( );
}
- virtual double getBinCenter( ::std::size_t index ) const {
+ virtual double getBinCenter( ::size_t index ) const {
if( bp::override func_getBinCenter = this->get_override( "getBinCenter" ) )
return func_getBinCenter( index );
else{
@@ -139,7 +139,7 @@ struct CustomBinAxis_wrapper : CustomBinAxis, bp::wrapper< CustomBinAxis > {
}
}
- double default_getBinCenter( ::std::size_t index ) const {
+ double default_getBinCenter( ::size_t index ) const {
return VariableBinAxis::getBinCenter( index );
}
@@ -167,7 +167,7 @@ struct CustomBinAxis_wrapper : CustomBinAxis, bp::wrapper< CustomBinAxis > {
return VariableBinAxis::getMin( );
}
- virtual ::std::size_t getSize( ) const {
+ virtual ::size_t getSize( ) const {
if( bp::override func_getSize = this->get_override( "getSize" ) )
return func_getSize( );
else{
@@ -175,7 +175,7 @@ struct CustomBinAxis_wrapper : CustomBinAxis, bp::wrapper< CustomBinAxis > {
}
}
- ::std::size_t default_getSize( ) const {
+ ::size_t default_getSize( ) const {
return VariableBinAxis::getSize( );
}
@@ -263,8 +263,8 @@ void register_CustomBinAxis_class(){
}
{ //::VariableBinAxis::findClosestIndex
- typedef ::std::size_t ( ::VariableBinAxis::*findClosestIndex_function_type)( double ) const;
- typedef ::std::size_t ( CustomBinAxis_wrapper::*default_findClosestIndex_function_type)( double ) const;
+ typedef ::size_t ( ::VariableBinAxis::*findClosestIndex_function_type)( double ) const;
+ typedef ::size_t ( CustomBinAxis_wrapper::*default_findClosestIndex_function_type)( double ) const;
CustomBinAxis_exposer.def(
"findClosestIndex"
@@ -286,8 +286,8 @@ void register_CustomBinAxis_class(){
}
{ //::VariableBinAxis::getBinCenter
- typedef double ( ::VariableBinAxis::*getBinCenter_function_type)( ::std::size_t ) const;
- typedef double ( CustomBinAxis_wrapper::*default_getBinCenter_function_type)( ::std::size_t ) const;
+ typedef double ( ::VariableBinAxis::*getBinCenter_function_type)( ::size_t ) const;
+ typedef double ( CustomBinAxis_wrapper::*default_getBinCenter_function_type)( ::size_t ) const;
CustomBinAxis_exposer.def(
"getBinCenter"
@@ -320,8 +320,8 @@ void register_CustomBinAxis_class(){
}
{ //::VariableBinAxis::getSize
- typedef ::std::size_t ( ::VariableBinAxis::*getSize_function_type)( ) const;
- typedef ::std::size_t ( CustomBinAxis_wrapper::*default_getSize_function_type)( ) const;
+ typedef ::size_t ( ::VariableBinAxis::*getSize_function_type)( ) const;
+ typedef ::size_t ( CustomBinAxis_wrapper::*default_getSize_function_type)( ) const;
CustomBinAxis_exposer.def(
"getSize"
diff --git a/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
index d5e63d9522e..b7a59cb97d0 100644
--- a/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -354,8 +354,8 @@ void register_FormFactorAnisoPyramid_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorAnisoPyramid_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorAnisoPyramid_wrapper::*default_size_function_type)( ) const;
FormFactorAnisoPyramid_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorBox.pypp.cpp b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
index be75e82c34e..12242f111ca 100644
--- a/Core/PythonAPI/src/FormFactorBox.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -345,8 +345,8 @@ void register_FormFactorBox_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorBox_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorBox_wrapper::*default_size_function_type)( ) const;
FormFactorBox_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorCone.pypp.cpp b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
index 3d284c34ae3..39cd461a216 100644
--- a/Core/PythonAPI/src/FormFactorCone.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -336,8 +336,8 @@ void register_FormFactorCone_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorCone_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorCone_wrapper::*default_size_function_type)( ) const;
FormFactorCone_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorCone6.pypp.cpp b/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
index e8c2db29d88..ab198fc17fc 100644
--- a/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -336,8 +336,8 @@ void register_FormFactorCone6_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorCone6_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorCone6_wrapper::*default_size_function_type)( ) const;
FormFactorCone6_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
index c810192de8e..68c1e2a1a4d 100644
--- a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -318,8 +318,8 @@ void register_FormFactorCrystal_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorCrystal_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorCrystal_wrapper::*default_size_function_type)( ) const;
FormFactorCrystal_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp b/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
index 461f2741d5e..d03f49cf45d 100644
--- a/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -354,8 +354,8 @@ void register_FormFactorCuboctahedron_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorCuboctahedron_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorCuboctahedron_wrapper::*default_size_function_type)( ) const;
FormFactorCuboctahedron_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
index 9b76998f243..6c3db6d101d 100644
--- a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -327,8 +327,8 @@ void register_FormFactorCylinder_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorCylinder_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorCylinder_wrapper::*default_size_function_type)( ) const;
FormFactorCylinder_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
index 040c114cada..68e923d4edd 100644
--- a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
@@ -150,7 +150,7 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
IFormFactorDecorator::setAmbientMaterial( boost::ref(material) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -158,7 +158,7 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -302,8 +302,8 @@ void register_FormFactorDecoratorDebyeWaller_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorDecoratorDebyeWaller_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorDecoratorDebyeWaller_wrapper::*default_size_function_type)( ) const;
FormFactorDecoratorDebyeWaller_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
index 03c9977be11..f7b8366b180 100644
--- a/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -345,8 +345,8 @@ void register_FormFactorEllipsoidalCylinder_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorEllipsoidalCylinder_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorEllipsoidalCylinder_wrapper::*default_size_function_type)( ) const;
FormFactorEllipsoidalCylinder_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
index ff0143cdc27..157987d9116 100644
--- a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -318,8 +318,8 @@ void register_FormFactorFullSphere_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorFullSphere_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorFullSphere_wrapper::*default_size_function_type)( ) const;
FormFactorFullSphere_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
index 085ae71b1dc..be04ad0d142 100644
--- a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -327,8 +327,8 @@ void register_FormFactorFullSpheroid_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorFullSpheroid_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorFullSpheroid_wrapper::*default_size_function_type)( ) const;
FormFactorFullSpheroid_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
index 485b89a569d..561dd01abd1 100644
--- a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
@@ -162,7 +162,7 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -170,7 +170,7 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -335,8 +335,8 @@ void register_FormFactorGauss_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorGauss_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorGauss_wrapper::*default_size_function_type)( ) const;
FormFactorGauss_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp b/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
index bddd8d5356e..def1ba05d7c 100644
--- a/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -345,8 +345,8 @@ void register_FormFactorHemiEllipsoid_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorHemiEllipsoid_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorHemiEllipsoid_wrapper::*default_size_function_type)( ) const;
FormFactorHemiEllipsoid_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorLongBoxGauss.pypp.cpp b/Core/PythonAPI/src/FormFactorLongBoxGauss.pypp.cpp
index b44708da68b..220ddafb800 100644
--- a/Core/PythonAPI/src/FormFactorLongBoxGauss.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorLongBoxGauss.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorLongBoxGauss_wrapper : FormFactorLongBoxGauss, bp::wrapper< For
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorLongBoxGauss_wrapper : FormFactorLongBoxGauss, bp::wrapper< For
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -345,8 +345,8 @@ void register_FormFactorLongBoxGauss_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorLongBoxGauss_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorLongBoxGauss_wrapper::*default_size_function_type)( ) const;
FormFactorLongBoxGauss_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorLongBoxLorentz.pypp.cpp b/Core/PythonAPI/src/FormFactorLongBoxLorentz.pypp.cpp
index 1a09f638f52..a2db63265a8 100644
--- a/Core/PythonAPI/src/FormFactorLongBoxLorentz.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorLongBoxLorentz.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorLongBoxLorentz_wrapper : FormFactorLongBoxLorentz, bp::wrapper<
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorLongBoxLorentz_wrapper : FormFactorLongBoxLorentz, bp::wrapper<
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -345,8 +345,8 @@ void register_FormFactorLongBoxLorentz_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorLongBoxLorentz_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorLongBoxLorentz_wrapper::*default_size_function_type)( ) const;
FormFactorLongBoxLorentz_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
index ac1f83e0af3..4de818bad7a 100644
--- a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
@@ -162,7 +162,7 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -170,7 +170,7 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -344,8 +344,8 @@ void register_FormFactorLorentz_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorLorentz_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorLorentz_wrapper::*default_size_function_type)( ) const;
FormFactorLorentz_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
index 3fcffd80cda..0d4a45deafd 100644
--- a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -336,8 +336,8 @@ void register_FormFactorPrism3_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorPrism3_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorPrism3_wrapper::*default_size_function_type)( ) const;
FormFactorPrism3_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
index 7c37ea206ab..47804a615aa 100644
--- a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -327,8 +327,8 @@ void register_FormFactorPrism6_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorPrism6_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorPrism6_wrapper::*default_size_function_type)( ) const;
FormFactorPrism6_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
index b2eba2e2852..4f6cd0490a2 100644
--- a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -345,8 +345,8 @@ void register_FormFactorPyramid_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorPyramid_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorPyramid_wrapper::*default_size_function_type)( ) const;
FormFactorPyramid_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp b/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
index 5f9d6779a7c..857a01afd3c 100644
--- a/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -345,8 +345,8 @@ void register_FormFactorRipple1_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorRipple1_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorRipple1_wrapper::*default_size_function_type)( ) const;
FormFactorRipple1_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp b/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
index 04ba667eb56..6d28fd8ba4a 100644
--- a/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -354,8 +354,8 @@ void register_FormFactorRipple2_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorRipple2_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorRipple2_wrapper::*default_size_function_type)( ) const;
FormFactorRipple2_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
index 55954ed0ab4..ffb2e3338fa 100644
--- a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -318,8 +318,8 @@ void register_FormFactorSphereGaussianRadius_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorSphereGaussianRadius_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorSphereGaussianRadius_wrapper::*default_size_function_type)( ) const;
FormFactorSphereGaussianRadius_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorSphereLogNormalRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereLogNormalRadius.pypp.cpp
index c2e0be52937..8795f88169c 100644
--- a/Core/PythonAPI/src/FormFactorSphereLogNormalRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereLogNormalRadius.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorSphereLogNormalRadius_wrapper : FormFactorSphereLogNormalRadius
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorSphereLogNormalRadius_wrapper : FormFactorSphereLogNormalRadius
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -318,8 +318,8 @@ void register_FormFactorSphereLogNormalRadius_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorSphereLogNormalRadius_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorSphereLogNormalRadius_wrapper::*default_size_function_type)( ) const;
FormFactorSphereLogNormalRadius_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
index 6053aa84452..9eb57ada885 100644
--- a/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -318,8 +318,8 @@ void register_FormFactorSphereUniformRadius_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorSphereUniformRadius_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorSphereUniformRadius_wrapper::*default_size_function_type)( ) const;
FormFactorSphereUniformRadius_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp b/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp
index 786f06cd5a9..62a2153ed55 100644
--- a/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -345,8 +345,8 @@ void register_FormFactorTetrahedron_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorTetrahedron_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorTetrahedron_wrapper::*default_size_function_type)( ) const;
FormFactorTetrahedron_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorTrivial.pypp.cpp b/Core/PythonAPI/src/FormFactorTrivial.pypp.cpp
index 6c4166333d0..50934e48079 100644
--- a/Core/PythonAPI/src/FormFactorTrivial.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTrivial.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorTrivial_wrapper : FormFactorTrivial, bp::wrapper< FormFactorTri
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorTrivial_wrapper : FormFactorTrivial, bp::wrapper< FormFactorTri
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -318,8 +318,8 @@ void register_FormFactorTrivial_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorTrivial_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorTrivial_wrapper::*default_size_function_type)( ) const;
FormFactorTrivial_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorTruncatedCube.pypp.cpp b/Core/PythonAPI/src/FormFactorTruncatedCube.pypp.cpp
index da41ab3d190..d4176518202 100644
--- a/Core/PythonAPI/src/FormFactorTruncatedCube.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTruncatedCube.pypp.cpp
@@ -143,7 +143,7 @@ struct FormFactorTruncatedCube_wrapper : FormFactorTruncatedCube, bp::wrapper< F
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -151,7 +151,7 @@ struct FormFactorTruncatedCube_wrapper : FormFactorTruncatedCube, bp::wrapper< F
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -312,8 +312,8 @@ void register_FormFactorTruncatedCube_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorTruncatedCube_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorTruncatedCube_wrapper::*default_size_function_type)( ) const;
FormFactorTruncatedCube_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorTruncatedSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorTruncatedSphere.pypp.cpp
index 6bccdbf1dab..d9cebc67a7e 100644
--- a/Core/PythonAPI/src/FormFactorTruncatedSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTruncatedSphere.pypp.cpp
@@ -143,7 +143,7 @@ struct FormFactorTruncatedSphere_wrapper : FormFactorTruncatedSphere, bp::wrappe
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -151,7 +151,7 @@ struct FormFactorTruncatedSphere_wrapper : FormFactorTruncatedSphere, bp::wrappe
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -303,8 +303,8 @@ void register_FormFactorTruncatedSphere_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorTruncatedSphere_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorTruncatedSphere_wrapper::*default_size_function_type)( ) const;
FormFactorTruncatedSphere_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorTruncatedSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorTruncatedSpheroid.pypp.cpp
index 741fd64561d..aced352459f 100644
--- a/Core/PythonAPI/src/FormFactorTruncatedSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTruncatedSpheroid.pypp.cpp
@@ -155,7 +155,7 @@ struct FormFactorTruncatedSpheroid_wrapper : FormFactorTruncatedSpheroid, bp::wr
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -163,7 +163,7 @@ struct FormFactorTruncatedSpheroid_wrapper : FormFactorTruncatedSpheroid, bp::wr
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -336,8 +336,8 @@ void register_FormFactorTruncatedSpheroid_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorTruncatedSpheroid_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorTruncatedSpheroid_wrapper::*default_size_function_type)( ) const;
FormFactorTruncatedSpheroid_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/FormFactorWeighted.pypp.cpp b/Core/PythonAPI/src/FormFactorWeighted.pypp.cpp
index 912c1367e88..6cabff24b30 100644
--- a/Core/PythonAPI/src/FormFactorWeighted.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorWeighted.pypp.cpp
@@ -143,7 +143,7 @@ struct FormFactorWeighted_wrapper : FormFactorWeighted, bp::wrapper< FormFactorW
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -151,7 +151,7 @@ struct FormFactorWeighted_wrapper : FormFactorWeighted, bp::wrapper< FormFactorW
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -304,8 +304,8 @@ void register_FormFactorWeighted_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( FormFactorWeighted_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( FormFactorWeighted_wrapper::*default_size_function_type)( ) const;
FormFactorWeighted_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IAxis.pypp.cpp b/Core/PythonAPI/src/IAxis.pypp.cpp
index 1796240a109..f0212eb8c03 100644
--- a/Core/PythonAPI/src/IAxis.pypp.cpp
+++ b/Core/PythonAPI/src/IAxis.pypp.cpp
@@ -76,12 +76,12 @@ struct IAxis_wrapper : IAxis, bp::wrapper< IAxis > {
return IAxis::createDoubleBinSize( );
}
- virtual ::std::size_t findClosestIndex( double value ) const {
+ virtual ::size_t findClosestIndex( double value ) const {
bp::override func_findClosestIndex = this->get_override( "findClosestIndex" );
return func_findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::std::size_t index ) const {
+ virtual ::Bin1D getBin( ::size_t index ) const {
bp::override func_getBin = this->get_override( "getBin" );
return func_getBin( index );
}
@@ -98,7 +98,7 @@ struct IAxis_wrapper : IAxis, bp::wrapper< IAxis > {
return IAxis::getBinBoundaries( );
}
- virtual double getBinCenter( ::std::size_t index ) const {
+ virtual double getBinCenter( ::size_t index ) const {
bp::override func_getBinCenter = this->get_override( "getBinCenter" );
return func_getBinCenter( index );
}
@@ -125,12 +125,12 @@ struct IAxis_wrapper : IAxis, bp::wrapper< IAxis > {
return func_getMin( );
}
- virtual ::std::size_t getSize( ) const {
+ virtual ::size_t getSize( ) const {
bp::override func_getSize = this->get_override( "getSize" );
return func_getSize( );
}
- virtual double operator[]( ::std::size_t index ) const {
+ virtual double operator[]( ::size_t index ) const {
bp::override func___getitem__ = this->get_override( "__getitem__" );
return func___getitem__( index );
}
@@ -200,7 +200,7 @@ void register_IAxis_class(){
}
{ //::IAxis::findClosestIndex
- typedef ::std::size_t ( ::IAxis::*findClosestIndex_function_type)( double ) const;
+ typedef ::size_t ( ::IAxis::*findClosestIndex_function_type)( double ) const;
IAxis_exposer.def(
"findClosestIndex"
@@ -211,7 +211,7 @@ void register_IAxis_class(){
}
{ //::IAxis::getBin
- typedef ::Bin1D ( ::IAxis::*getBin_function_type)( ::std::size_t ) const;
+ typedef ::Bin1D ( ::IAxis::*getBin_function_type)( ::size_t ) const;
IAxis_exposer.def(
"getBin"
@@ -233,7 +233,7 @@ void register_IAxis_class(){
}
{ //::IAxis::getBinCenter
- typedef double ( ::IAxis::*getBinCenter_function_type)( ::std::size_t ) const;
+ typedef double ( ::IAxis::*getBinCenter_function_type)( ::size_t ) const;
IAxis_exposer.def(
"getBinCenter"
@@ -285,7 +285,7 @@ void register_IAxis_class(){
}
{ //::IAxis::getSize
- typedef ::std::size_t ( ::IAxis::*getSize_function_type)( ) const;
+ typedef ::size_t ( ::IAxis::*getSize_function_type)( ) const;
IAxis_exposer.def(
"getSize"
@@ -295,7 +295,7 @@ void register_IAxis_class(){
}
{ //::IAxis::operator[]
- typedef double ( ::IAxis::*__getitem___function_type)( ::std::size_t ) const;
+ typedef double ( ::IAxis::*__getitem___function_type)( ::size_t ) const;
IAxis_exposer.def(
"__getitem__"
diff --git a/Core/PythonAPI/src/IFormFactor.pypp.cpp b/Core/PythonAPI/src/IFormFactor.pypp.cpp
index 30e0be80b66..21349aa0c89 100644
--- a/Core/PythonAPI/src/IFormFactor.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactor.pypp.cpp
@@ -122,7 +122,7 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -130,7 +130,7 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -269,8 +269,8 @@ void register_IFormFactor_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( IFormFactor_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( IFormFactor_wrapper::*default_size_function_type)( ) const;
IFormFactor_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
index 58eed019462..112a6d8362b 100644
--- a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
@@ -134,7 +134,7 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
IFormFactor::setAmbientMaterial( boost::ref(arg0) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -142,7 +142,7 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -293,8 +293,8 @@ void register_IFormFactorBorn_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( IFormFactorBorn_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( IFormFactorBorn_wrapper::*default_size_function_type)( ) const;
IFormFactorBorn_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
index a7ed4b7c886..765a6415b1d 100644
--- a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
@@ -134,7 +134,7 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -142,7 +142,7 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -292,8 +292,8 @@ void register_IFormFactorDecorator_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( IFormFactorDecorator_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( IFormFactorDecorator_wrapper::*default_size_function_type)( ) const;
IFormFactorDecorator_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
index e14db071c01..aaf5386eb26 100644
--- a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
+++ b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
@@ -117,7 +117,7 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -125,7 +125,7 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -254,8 +254,8 @@ void register_IInterferenceFunction_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( IInterferenceFunction_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( IInterferenceFunction_wrapper::*default_size_function_type)( ) const;
IInterferenceFunction_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IRotation.pypp.cpp b/Core/PythonAPI/src/IRotation.pypp.cpp
index f9310e533b9..d3520b60d43 100644
--- a/Core/PythonAPI/src/IRotation.pypp.cpp
+++ b/Core/PythonAPI/src/IRotation.pypp.cpp
@@ -103,7 +103,7 @@ struct IRotation_wrapper : IRotation, bp::wrapper< IRotation > {
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -111,7 +111,7 @@ struct IRotation_wrapper : IRotation, bp::wrapper< IRotation > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -249,8 +249,8 @@ void register_IRotation_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( IRotation_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( IRotation_wrapper::*default_size_function_type)( ) const;
IRotation_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ISample.pypp.cpp b/Core/PythonAPI/src/ISample.pypp.cpp
index d750c370f38..700f4d0373a 100644
--- a/Core/PythonAPI/src/ISample.pypp.cpp
+++ b/Core/PythonAPI/src/ISample.pypp.cpp
@@ -93,7 +93,7 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -101,7 +101,7 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -208,8 +208,8 @@ void register_ISample_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( ISample_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( ISample_wrapper::*default_size_function_type)( ) const;
ISample_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/InterferenceFunction1DLattice.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction1DLattice.pypp.cpp
index d881cc57a54..44788bb5e04 100644
--- a/Core/PythonAPI/src/InterferenceFunction1DLattice.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction1DLattice.pypp.cpp
@@ -131,7 +131,7 @@ struct InterferenceFunction1DLattice_wrapper : InterferenceFunction1DLattice, bp
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -139,7 +139,7 @@ struct InterferenceFunction1DLattice_wrapper : InterferenceFunction1DLattice, bp
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -299,8 +299,8 @@ void register_InterferenceFunction1DLattice_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( InterferenceFunction1DLattice_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( InterferenceFunction1DLattice_wrapper::*default_size_function_type)( ) const;
InterferenceFunction1DLattice_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
index fd6b2112c38..1df201479f6 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
@@ -131,7 +131,7 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -139,7 +139,7 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -321,8 +321,8 @@ void register_InterferenceFunction2DLattice_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( InterferenceFunction2DLattice_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( InterferenceFunction2DLattice_wrapper::*default_size_function_type)( ) const;
InterferenceFunction2DLattice_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
index a73631c87b6..1637b410649 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
@@ -131,7 +131,7 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -139,7 +139,7 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -360,8 +360,8 @@ void register_InterferenceFunction2DParaCrystal_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( InterferenceFunction2DParaCrystal_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( InterferenceFunction2DParaCrystal_wrapper::*default_size_function_type)( ) const;
InterferenceFunction2DParaCrystal_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
index 67766f6f89c..bd5a0d89be9 100644
--- a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
@@ -131,7 +131,7 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -139,7 +139,7 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -270,8 +270,8 @@ void register_InterferenceFunctionNone_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( InterferenceFunctionNone_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( InterferenceFunctionNone_wrapper::*default_size_function_type)( ) const;
InterferenceFunctionNone_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/InterferenceFunctionRadialParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunctionRadialParaCrystal.pypp.cpp
index 04a77f9e735..fb41598df24 100644
--- a/Core/PythonAPI/src/InterferenceFunctionRadialParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunctionRadialParaCrystal.pypp.cpp
@@ -131,7 +131,7 @@ struct InterferenceFunctionRadialParaCrystal_wrapper : InterferenceFunctionRadia
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -139,7 +139,7 @@ struct InterferenceFunctionRadialParaCrystal_wrapper : InterferenceFunctionRadia
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -353,8 +353,8 @@ void register_InterferenceFunctionRadialParaCrystal_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( InterferenceFunctionRadialParaCrystal_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( InterferenceFunctionRadialParaCrystal_wrapper::*default_size_function_type)( ) const;
InterferenceFunctionRadialParaCrystal_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/LayerRoughness.pypp.cpp b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
index ac7e904e5bf..aaf156c3fcb 100644
--- a/Core/PythonAPI/src/LayerRoughness.pypp.cpp
+++ b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
@@ -102,7 +102,7 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -110,7 +110,7 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -293,8 +293,8 @@ void register_LayerRoughness_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( LayerRoughness_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( LayerRoughness_wrapper::*default_size_function_type)( ) const;
LayerRoughness_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParameterPool.pypp.cpp b/Core/PythonAPI/src/ParameterPool.pypp.cpp
index 2fef01dc11e..bd376e9cfbe 100644
--- a/Core/PythonAPI/src/ParameterPool.pypp.cpp
+++ b/Core/PythonAPI/src/ParameterPool.pypp.cpp
@@ -182,7 +182,7 @@ void register_ParameterPool_class(){
}
{ //::ParameterPool::size
- typedef ::std::size_t ( ::ParameterPool::*size_function_type)( ) const;
+ typedef ::size_t ( ::ParameterPool::*size_function_type)( ) const;
ParameterPool_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/PythonListConverter.cpp b/Core/PythonAPI/src/PythonListConverter.cpp
index 0196207c5e8..f56b227d60c 100644
--- a/Core/PythonAPI/src/PythonListConverter.cpp
+++ b/Core/PythonAPI/src/PythonListConverter.cpp
@@ -14,7 +14,7 @@
// ************************************************************************** //
#include "PythonListConverter.h"
-#include "Types.h"
+#include "Vectors3D.h"
void register_python2cpp_converters()
{
diff --git a/Core/PythonAPI/src/PythonModule.cpp b/Core/PythonAPI/src/PythonModule.cpp
index 0de06ca3b19..f294144b9b6 100644
--- a/Core/PythonAPI/src/PythonModule.cpp
+++ b/Core/PythonAPI/src/PythonModule.cpp
@@ -10,162 +10,162 @@ GCC_DIAG_ON(missing-field-initializers)
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#define PY_ARRAY_UNIQUE_SYMBOL BORNAGAIN_PYTHONAPI_ARRAY
#include "numpy/arrayobject.h"
-#include "FormFactorFullSpheroid.pypp.h"
-#include "DistributionGate.pypp.h"
-#include "SimpleSelectionRule.pypp.h"
-#include "RealParameterWrapper.pypp.h"
+#include "vector_longinteger_t.pypp.h"
+#include "vdouble2d_t.pypp.h"
+#include "vector_string_t.pypp.h"
+#include "vector_complex_t.pypp.h"
+#include "vector_integer_t.pypp.h"
#include "vdouble1d_t.pypp.h"
-#include "Lattice1DParameters.pypp.h"
-#include "SimulationParameters.pypp.h"
-#include "ThreadInfo.pypp.h"
-#include "InterferenceFunction2DLattice.pypp.h"
-#include "LayerInterface.pypp.h"
-#include "ILayout.pypp.h"
-#include "FormFactorLongBoxLorentz.pypp.h"
-#include "FormFactorCone6.pypp.h"
-#include "FormFactorTetrahedron.pypp.h"
-#include "FTDistribution1DCosine.pypp.h"
-#include "VerticalLine.pypp.h"
-#include "FTDistribution1DTriangle.pypp.h"
-#include "FormFactorWeighted.pypp.h"
-#include "InterferenceFunctionRadialParaCrystal.pypp.h"
-#include "DistributionGaussian.pypp.h"
-#include "IDetectorResolution.pypp.h"
-#include "FormFactorCylinder.pypp.h"
-#include "Crystal.pypp.h"
-#include "FTDistribution1DCauchy.pypp.h"
-#include "IFormFactorBorn.pypp.h"
-#include "FormFactorEllipsoidalCylinder.pypp.h"
-#include "InterferenceFunctionNone.pypp.h"
-#include "Histogram1D.pypp.h"
#include "vector_less__const_ISample_ptr___greater_.pypp.h"
-#include "WavevectorInfo.pypp.h"
-#include "HorizontalLine.pypp.h"
-#include "FTDistribution2DGate.pypp.h"
+#include "vector_realparameter_t.pypp.h"
+#include "vector_less__IDetector2D_scope_EAxesUnits__greater_.pypp.h"
#include "vector_kvector_t.pypp.h"
-#include "FormFactorTruncatedSpheroid.pypp.h"
-#include "IShape2D.pypp.h"
-#include "Particle.pypp.h"
-#include "vector_string_t.pypp.h"
-#include "FormFactorTrivial.pypp.h"
+#include "AttLimits.pypp.h"
+#include "IParameterized.pypp.h"
+#include "Beam.pypp.h"
+#include "Bin1D.pypp.h"
+#include "Bin1DCVector.pypp.h"
+#include "IAxis.pypp.h"
+#include "VariableBinAxis.pypp.h"
#include "ConstKBinAxis.pypp.h"
-#include "FTDistribution2DCauchy.pypp.h"
-#include "FormFactorCrystal.pypp.h"
-#include "ParticleDistribution.pypp.h"
-#include "vector_longinteger_t.pypp.h"
-#include "ResolutionFunction2DGaussian.pypp.h"
-#include "RectangularDetector.pypp.h"
+#include "ICloneable.pypp.h"
+#include "ISample.pypp.h"
+#include "ICompositeSample.pypp.h"
+#include "IClusteredParticles.pypp.h"
+#include "Crystal.pypp.h"
+#include "CustomBinAxis.pypp.h"
+#include "IDistribution1D.pypp.h"
+#include "DistributionCosine.pypp.h"
+#include "DistributionGate.pypp.h"
+#include "DistributionGaussian.pypp.h"
+#include "DistributionLogNormal.pypp.h"
+#include "DistributionLorentz.pypp.h"
+#include "IFTDecayFunction1D.pypp.h"
+#include "FTDecayFunction1DCauchy.pypp.h"
#include "FTDecayFunction1DGauss.pypp.h"
-#include "vector_less__IDetector2D_scope_EAxesUnits__greater_.pypp.h"
-#include "FTDistribution1DGauss.pypp.h"
+#include "FTDecayFunction1DTriangle.pypp.h"
+#include "FTDecayFunction1DVoigt.pypp.h"
+#include "IFTDecayFunction2D.pypp.h"
+#include "FTDecayFunction2DCauchy.pypp.h"
+#include "FTDecayFunction2DGauss.pypp.h"
+#include "FTDecayFunction2DVoigt.pypp.h"
+#include "IFTDistribution1D.pypp.h"
+#include "FTDistribution1DCauchy.pypp.h"
+#include "FTDistribution1DCosine.pypp.h"
#include "FTDistribution1DGate.pypp.h"
-#include "FormFactorAnisoPyramid.pypp.h"
+#include "FTDistribution1DGauss.pypp.h"
+#include "FTDistribution1DTriangle.pypp.h"
+#include "FTDistribution1DVoigt.pypp.h"
+#include "IFTDistribution2D.pypp.h"
+#include "Line.pypp.h"
+#include "FTDistribution2DCauchy.pypp.h"
+#include "FTDistribution2DCone.pypp.h"
+#include "FTDistribution2DGate.pypp.h"
+#include "FTDistribution2DGauss.pypp.h"
+#include "FTDistribution2DVoigt.pypp.h"
#include "FixedBinAxis.pypp.h"
-#include "MultiLayer.pypp.h"
#include "IFormFactor.pypp.h"
-#include "kvector_t.pypp.h"
-#include "Ellipse.pypp.h"
-#include "FormFactorSphereUniformRadius.pypp.h"
-#include "IHistogram.pypp.h"
-#include "Polygon.pypp.h"
-#include "OffSpecSimulation.pypp.h"
-#include "IFTDecayFunction2D.pypp.h"
-#include "FormFactorRipple1.pypp.h"
-#include "Simulation.pypp.h"
-#include "IObservable.pypp.h"
+#include "IFormFactorBorn.pypp.h"
+#include "FormFactorAnisoPyramid.pypp.h"
+#include "FormFactorBox.pypp.h"
+#include "FormFactorCone.pypp.h"
+#include "FormFactorCone6.pypp.h"
+#include "FormFactorCrystal.pypp.h"
+#include "FormFactorCuboctahedron.pypp.h"
+#include "FormFactorCylinder.pypp.h"
+#include "IFormFactorDecorator.pypp.h"
+#include "FormFactorDecoratorDebyeWaller.pypp.h"
+#include "FormFactorEllipsoidalCylinder.pypp.h"
+#include "FormFactorFullSphere.pypp.h"
+#include "FormFactorFullSpheroid.pypp.h"
+#include "FormFactorGauss.pypp.h"
+#include "FormFactorHemiEllipsoid.pypp.h"
+#include "FormFactorLongBoxGauss.pypp.h"
+#include "FormFactorLongBoxLorentz.pypp.h"
#include "FormFactorLorentz.pypp.h"
-#include "SpecularSimulation.pypp.h"
-#include "GISASSimulation.pypp.h"
-#include "ISelectionRule.pypp.h"
-#include "FormFactorRipple2.pypp.h"
-#include "RotationZ.pypp.h"
-#include "LayerRoughness.pypp.h"
-#include "Bin1DCVector.pypp.h"
-#include "FormFactorSphereGaussianRadius.pypp.h"
-#include "ParameterPool.pypp.h"
-#include "IsGISAXSDetector.pypp.h"
#include "FormFactorPrism3.pypp.h"
-#include "IMaterial.pypp.h"
-#include "FTDistribution1DVoigt.pypp.h"
-#include "IntensityDataFunctions.pypp.h"
#include "FormFactorPrism6.pypp.h"
-#include "IClusteredParticles.pypp.h"
-#include "VariableBinAxis.pypp.h"
-#include "IParticle.pypp.h"
-#include "DistributionCosine.pypp.h"
-#include "FormFactorHemiEllipsoid.pypp.h"
-#include "IAxis.pypp.h"
-#include "vector_integer_t.pypp.h"
-#include "IntensityDataIOFactory.pypp.h"
-#include "ParameterDistribution.pypp.h"
-#include "Layer.pypp.h"
#include "FormFactorPyramid.pypp.h"
-#include "RotationY.pypp.h"
-#include "CustomBinAxis.pypp.h"
-#include "FTDistribution2DCone.pypp.h"
-#include "IFTDistribution1D.pypp.h"
-#include "DistributionLorentz.pypp.h"
-#include "IDistribution1D.pypp.h"
-#include "FTDecayFunction2DVoigt.pypp.h"
-#include "FTDecayFunction1DCauchy.pypp.h"
-#include "Lattice2DParameters.pypp.h"
-#include "vdouble2d_t.pypp.h"
-#include "Line.pypp.h"
-#include "HomogeneousMagneticMaterial.pypp.h"
-#include "vector_realparameter_t.pypp.h"
-#include "FTDecayFunction1DVoigt.pypp.h"
-#include "IAbstractParticle.pypp.h"
+#include "FormFactorRipple1.pypp.h"
+#include "FormFactorRipple2.pypp.h"
+#include "FormFactorSphereGaussianRadius.pypp.h"
+#include "FormFactorSphereLogNormalRadius.pypp.h"
+#include "FormFactorSphereUniformRadius.pypp.h"
+#include "FormFactorTetrahedron.pypp.h"
+#include "FormFactorTrivial.pypp.h"
#include "FormFactorTruncatedCube.pypp.h"
-#include "FormFactorCuboctahedron.pypp.h"
+#include "FormFactorTruncatedSphere.pypp.h"
+#include "FormFactorTruncatedSpheroid.pypp.h"
+#include "FormFactorWeighted.pypp.h"
#include "IDetector2D.pypp.h"
+#include "Simulation.pypp.h"
+#include "GISASSimulation.pypp.h"
+#include "kvector_t.pypp.h"
#include "cvector_t.pypp.h"
-#include "PythonInterface_free_functions.pypp.h"
-#include "FormFactorSphereLogNormalRadius.pypp.h"
-#include "IResolutionFunction2D.pypp.h"
-#include "FormFactorFullSphere.pypp.h"
-#include "ParticleLayout.pypp.h"
-#include "FormFactorBox.pypp.h"
-#include "IParameterized.pypp.h"
-#include "FormFactorLongBoxGauss.pypp.h"
-#include "IFormFactorDecorator.pypp.h"
-#include "InterferenceFunction1DLattice.pypp.h"
-#include "RotationEuler.pypp.h"
-#include "ISample.pypp.h"
-#include "ISampleBuilder.pypp.h"
-#include "IRotation.pypp.h"
-#include "FTDecayFunction1DTriangle.pypp.h"
-#include "PythonInterface_global_variables.pypp.h"
-#include "Beam.pypp.h"
-#include "FTDecayFunction2DCauchy.pypp.h"
-#include "HomogeneousMaterial.pypp.h"
+#include "IShape2D.pypp.h"
+#include "Ellipse.pypp.h"
+#include "HorizontalLine.pypp.h"
+#include "Polygon.pypp.h"
#include "Rectangle.pypp.h"
-#include "FTDecayFunction2DGauss.pypp.h"
-#include "ICloneable.pypp.h"
+#include "VerticalLine.pypp.h"
+#include "IHistogram.pypp.h"
+#include "Histogram1D.pypp.h"
#include "Histogram2D.pypp.h"
-#include "ParticleCoreShell.pypp.h"
-#include "FormFactorDecoratorDebyeWaller.pypp.h"
-#include "MesoCrystal.pypp.h"
-#include "IObserver.pypp.h"
-#include "IntensityData.pypp.h"
-#include "Lattice.pypp.h"
-#include "AttLimits.pypp.h"
+#include "IMaterial.pypp.h"
+#include "HomogeneousMaterial.pypp.h"
+#include "HomogeneousMagneticMaterial.pypp.h"
+#include "IAbstractParticle.pypp.h"
+#include "IDetectorResolution.pypp.h"
#include "IInterferenceFunction.pypp.h"
+#include "ILayout.pypp.h"
+#include "IObservable.pypp.h"
+#include "IObserver.pypp.h"
+#include "IParticle.pypp.h"
+#include "IResolutionFunction2D.pypp.h"
+#include "IRotation.pypp.h"
+#include "ISampleBuilder.pypp.h"
+#include "ISelectionRule.pypp.h"
#include "Instrument.pypp.h"
-#include "FormFactorCone.pypp.h"
-#include "ParticleComposition.pypp.h"
-#include "RotationX.pypp.h"
-#include "FTDistribution2DGauss.pypp.h"
-#include "FormFactorTruncatedSphere.pypp.h"
-#include "FTDistribution2DVoigt.pypp.h"
-#include "FormFactorGauss.pypp.h"
+#include "IntensityDataFunctions.pypp.h"
+#include "IntensityDataIOFactory.pypp.h"
+#include "InterferenceFunction1DLattice.pypp.h"
+#include "InterferenceFunction2DLattice.pypp.h"
#include "InterferenceFunction2DParaCrystal.pypp.h"
-#include "IFTDecayFunction1D.pypp.h"
+#include "InterferenceFunctionNone.pypp.h"
+#include "InterferenceFunctionRadialParaCrystal.pypp.h"
#include "SphericalDetector.pypp.h"
-#include "ICompositeSample.pypp.h"
-#include "Bin1D.pypp.h"
-#include "vector_complex_t.pypp.h"
-#include "DistributionLogNormal.pypp.h"
-#include "IFTDistribution2D.pypp.h"
+#include "IsGISAXSDetector.pypp.h"
+#include "Lattice.pypp.h"
+#include "Lattice1DParameters.pypp.h"
+#include "Lattice2DParameters.pypp.h"
+#include "Layer.pypp.h"
+#include "LayerInterface.pypp.h"
+#include "LayerRoughness.pypp.h"
+#include "MesoCrystal.pypp.h"
+#include "MultiLayer.pypp.h"
+#include "OffSpecSimulation.pypp.h"
+#include "IntensityData.pypp.h"
+#include "ParameterDistribution.pypp.h"
+#include "ParameterPool.pypp.h"
+#include "Particle.pypp.h"
+#include "ParticleComposition.pypp.h"
+#include "ParticleCoreShell.pypp.h"
+#include "ParticleDistribution.pypp.h"
+#include "ParticleLayout.pypp.h"
+#include "RealParameterWrapper.pypp.h"
+#include "RectangularDetector.pypp.h"
+#include "ResolutionFunction2DGaussian.pypp.h"
+#include "RotationEuler.pypp.h"
+#include "RotationX.pypp.h"
+#include "RotationY.pypp.h"
+#include "RotationZ.pypp.h"
+#include "SimpleSelectionRule.pypp.h"
+#include "SimulationParameters.pypp.h"
+#include "SpecularSimulation.pypp.h"
+#include "ThreadInfo.pypp.h"
+#include "WavevectorInfo.pypp.h"
+#include "PythonInterface_global_variables.pypp.h"
+#include "PythonInterface_free_functions.pypp.h"
#include "__call_policies.pypp.hpp"
#include "__call_policies.pypp.hpp"
diff --git a/Core/PythonAPI/src/RotationEuler.pypp.cpp b/Core/PythonAPI/src/RotationEuler.pypp.cpp
index 9069754810b..ee4712270a6 100644
--- a/Core/PythonAPI/src/RotationEuler.pypp.cpp
+++ b/Core/PythonAPI/src/RotationEuler.pypp.cpp
@@ -131,7 +131,7 @@ struct RotationEuler_wrapper : RotationEuler, bp::wrapper< RotationEuler > {
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -139,7 +139,7 @@ struct RotationEuler_wrapper : RotationEuler, bp::wrapper< RotationEuler > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -297,8 +297,8 @@ void register_RotationEuler_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( RotationEuler_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( RotationEuler_wrapper::*default_size_function_type)( ) const;
RotationEuler_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/RotationX.pypp.cpp b/Core/PythonAPI/src/RotationX.pypp.cpp
index 18959c954bc..fea97ad6868 100644
--- a/Core/PythonAPI/src/RotationX.pypp.cpp
+++ b/Core/PythonAPI/src/RotationX.pypp.cpp
@@ -131,7 +131,7 @@ struct RotationX_wrapper : RotationX, bp::wrapper< RotationX > {
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -139,7 +139,7 @@ struct RotationX_wrapper : RotationX, bp::wrapper< RotationX > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -279,8 +279,8 @@ void register_RotationX_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( RotationX_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( RotationX_wrapper::*default_size_function_type)( ) const;
RotationX_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/RotationY.pypp.cpp b/Core/PythonAPI/src/RotationY.pypp.cpp
index 145b5261349..381634daf08 100644
--- a/Core/PythonAPI/src/RotationY.pypp.cpp
+++ b/Core/PythonAPI/src/RotationY.pypp.cpp
@@ -131,7 +131,7 @@ struct RotationY_wrapper : RotationY, bp::wrapper< RotationY > {
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -139,7 +139,7 @@ struct RotationY_wrapper : RotationY, bp::wrapper< RotationY > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -279,8 +279,8 @@ void register_RotationY_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( RotationY_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( RotationY_wrapper::*default_size_function_type)( ) const;
RotationY_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/RotationZ.pypp.cpp b/Core/PythonAPI/src/RotationZ.pypp.cpp
index 98255874217..0f188f4c43f 100644
--- a/Core/PythonAPI/src/RotationZ.pypp.cpp
+++ b/Core/PythonAPI/src/RotationZ.pypp.cpp
@@ -131,7 +131,7 @@ struct RotationZ_wrapper : RotationZ, bp::wrapper< RotationZ > {
ISample::printSampleTree( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
else{
@@ -139,7 +139,7 @@ struct RotationZ_wrapper : RotationZ, bp::wrapper< RotationZ > {
}
}
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ISample::size( );
}
@@ -279,8 +279,8 @@ void register_RotationZ_class(){
}
{ //::ISample::size
- typedef ::std::size_t ( ::ISample::*size_function_type)( ) const;
- typedef ::std::size_t ( RotationZ_wrapper::*default_size_function_type)( ) const;
+ typedef ::size_t ( ::ISample::*size_function_type)( ) const;
+ typedef ::size_t ( RotationZ_wrapper::*default_size_function_type)( ) const;
RotationZ_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/VariableBinAxis.pypp.cpp b/Core/PythonAPI/src/VariableBinAxis.pypp.cpp
index 2c516db899d..d647de979e8 100644
--- a/Core/PythonAPI/src/VariableBinAxis.pypp.cpp
+++ b/Core/PythonAPI/src/VariableBinAxis.pypp.cpp
@@ -28,7 +28,7 @@ namespace bp = boost::python;
struct VariableBinAxis_wrapper : VariableBinAxis, bp::wrapper< VariableBinAxis > {
- VariableBinAxis_wrapper(::std::string const & name, ::std::size_t nbins, ::std::vector< double > const & bin_boundaries )
+ VariableBinAxis_wrapper(::std::string const & name, ::size_t nbins, ::std::vector< double > const & bin_boundaries )
: VariableBinAxis( name, nbins, boost::ref(bin_boundaries) )
, bp::wrapper< VariableBinAxis >(){
// constructor
@@ -59,7 +59,7 @@ struct VariableBinAxis_wrapper : VariableBinAxis, bp::wrapper< VariableBinAxis >
return VariableBinAxis::createClippedAxis( left, right );
}
- virtual ::std::size_t findClosestIndex( double value ) const {
+ virtual ::size_t findClosestIndex( double value ) const {
if( bp::override func_findClosestIndex = this->get_override( "findClosestIndex" ) )
return func_findClosestIndex( value );
else{
@@ -67,11 +67,11 @@ struct VariableBinAxis_wrapper : VariableBinAxis, bp::wrapper< VariableBinAxis >
}
}
- ::std::size_t default_findClosestIndex( double value ) const {
+ ::size_t default_findClosestIndex( double value ) const {
return VariableBinAxis::findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::std::size_t index ) const {
+ virtual ::Bin1D getBin( ::size_t index ) const {
if( bp::override func_getBin = this->get_override( "getBin" ) )
return func_getBin( index );
else{
@@ -79,7 +79,7 @@ struct VariableBinAxis_wrapper : VariableBinAxis, bp::wrapper< VariableBinAxis >
}
}
- ::Bin1D default_getBin( ::std::size_t index ) const {
+ ::Bin1D default_getBin( ::size_t index ) const {
return VariableBinAxis::getBin( index );
}
@@ -95,7 +95,7 @@ struct VariableBinAxis_wrapper : VariableBinAxis, bp::wrapper< VariableBinAxis >
return VariableBinAxis::getBinBoundaries( );
}
- virtual double getBinCenter( ::std::size_t index ) const {
+ virtual double getBinCenter( ::size_t index ) const {
if( bp::override func_getBinCenter = this->get_override( "getBinCenter" ) )
return func_getBinCenter( index );
else{
@@ -103,7 +103,7 @@ struct VariableBinAxis_wrapper : VariableBinAxis, bp::wrapper< VariableBinAxis >
}
}
- double default_getBinCenter( ::std::size_t index ) const {
+ double default_getBinCenter( ::size_t index ) const {
return VariableBinAxis::getBinCenter( index );
}
@@ -143,7 +143,7 @@ struct VariableBinAxis_wrapper : VariableBinAxis, bp::wrapper< VariableBinAxis >
return VariableBinAxis::getMin( );
}
- virtual ::std::size_t getSize( ) const {
+ virtual ::size_t getSize( ) const {
if( bp::override func_getSize = this->get_override( "getSize" ) )
return func_getSize( );
else{
@@ -151,11 +151,11 @@ struct VariableBinAxis_wrapper : VariableBinAxis, bp::wrapper< VariableBinAxis >
}
}
- ::std::size_t default_getSize( ) const {
+ ::size_t default_getSize( ) const {
return VariableBinAxis::getSize( );
}
- virtual double operator[]( ::std::size_t index ) const {
+ virtual double operator[]( ::size_t index ) const {
if( bp::override func___getitem__ = this->get_override( "__getitem__" ) )
return func___getitem__( index );
else{
@@ -163,7 +163,7 @@ struct VariableBinAxis_wrapper : VariableBinAxis, bp::wrapper< VariableBinAxis >
}
}
- double default___getitem__( ::std::size_t index ) const {
+ double default___getitem__( ::size_t index ) const {
return VariableBinAxis::operator[]( index );
}
@@ -199,7 +199,7 @@ void register_VariableBinAxis_class(){
{ //::VariableBinAxis
typedef bp::class_< VariableBinAxis_wrapper, bp::bases< IAxis >, std::auto_ptr< VariableBinAxis_wrapper >, boost::noncopyable > VariableBinAxis_exposer_t;
- VariableBinAxis_exposer_t VariableBinAxis_exposer = VariableBinAxis_exposer_t( "VariableBinAxis", "Axis with variable bin size.", bp::init< std::string const &, std::size_t, std::vector< double > const & >(( bp::arg("name"), bp::arg("nbins"), bp::arg("bin_boundaries") ), "VariableBinAxis constructor @param name Axis name @param nbins number of bins @param bin_boundaries Array of size nbins+1 containing low-edges for each bin and upper edge of last bin.\n\n:Parameters:\n - 'name' - Axis name\n - 'nbins' - number of bins\n - 'bin_boundaries' - Array of size nbins+1 containing low-edges for each\n") );
+ VariableBinAxis_exposer_t VariableBinAxis_exposer = VariableBinAxis_exposer_t( "VariableBinAxis", "Axis with variable bin size.", bp::init< std::string const &, size_t, std::vector< double > const & >(( bp::arg("name"), bp::arg("nbins"), bp::arg("bin_boundaries") ), "VariableBinAxis constructor @param name Axis name @param nbins number of bins @param bin_boundaries Array of size nbins+1 containing low-edges for each bin and upper edge of last bin.\n\n:Parameters:\n - 'name' - Axis name\n - 'nbins' - number of bins\n - 'bin_boundaries' - Array of size nbins+1 containing low-edges for each\n") );
bp::scope VariableBinAxis_scope( VariableBinAxis_exposer );
{ //::VariableBinAxis::clone
@@ -228,8 +228,8 @@ void register_VariableBinAxis_class(){
}
{ //::VariableBinAxis::findClosestIndex
- typedef ::std::size_t ( ::VariableBinAxis::*findClosestIndex_function_type)( double ) const;
- typedef ::std::size_t ( VariableBinAxis_wrapper::*default_findClosestIndex_function_type)( double ) const;
+ typedef ::size_t ( ::VariableBinAxis::*findClosestIndex_function_type)( double ) const;
+ typedef ::size_t ( VariableBinAxis_wrapper::*default_findClosestIndex_function_type)( double ) const;
VariableBinAxis_exposer.def(
"findClosestIndex"
@@ -240,8 +240,8 @@ void register_VariableBinAxis_class(){
}
{ //::VariableBinAxis::getBin
- typedef ::Bin1D ( ::VariableBinAxis::*getBin_function_type)( ::std::size_t ) const;
- typedef ::Bin1D ( VariableBinAxis_wrapper::*default_getBin_function_type)( ::std::size_t ) const;
+ typedef ::Bin1D ( ::VariableBinAxis::*getBin_function_type)( ::size_t ) const;
+ typedef ::Bin1D ( VariableBinAxis_wrapper::*default_getBin_function_type)( ::size_t ) const;
VariableBinAxis_exposer.def(
"getBin"
@@ -263,8 +263,8 @@ void register_VariableBinAxis_class(){
}
{ //::VariableBinAxis::getBinCenter
- typedef double ( ::VariableBinAxis::*getBinCenter_function_type)( ::std::size_t ) const;
- typedef double ( VariableBinAxis_wrapper::*default_getBinCenter_function_type)( ::std::size_t ) const;
+ typedef double ( ::VariableBinAxis::*getBinCenter_function_type)( ::size_t ) const;
+ typedef double ( VariableBinAxis_wrapper::*default_getBinCenter_function_type)( ::size_t ) const;
VariableBinAxis_exposer.def(
"getBinCenter"
@@ -308,8 +308,8 @@ void register_VariableBinAxis_class(){
}
{ //::VariableBinAxis::getSize
- typedef ::std::size_t ( ::VariableBinAxis::*getSize_function_type)( ) const;
- typedef ::std::size_t ( VariableBinAxis_wrapper::*default_getSize_function_type)( ) const;
+ typedef ::size_t ( ::VariableBinAxis::*getSize_function_type)( ) const;
+ typedef ::size_t ( VariableBinAxis_wrapper::*default_getSize_function_type)( ) const;
VariableBinAxis_exposer.def(
"getSize"
@@ -319,8 +319,8 @@ void register_VariableBinAxis_class(){
}
{ //::VariableBinAxis::operator[]
- typedef double ( ::VariableBinAxis::*__getitem___function_type)( ::std::size_t ) const;
- typedef double ( VariableBinAxis_wrapper::*default___getitem___function_type)( ::std::size_t ) const;
+ typedef double ( ::VariableBinAxis::*__getitem___function_type)( ::size_t ) const;
+ typedef double ( VariableBinAxis_wrapper::*default___getitem___function_type)( ::size_t ) const;
VariableBinAxis_exposer.def(
"__getitem__"
diff --git a/Fit/PythonAPI/src/PythonModule.cpp b/Fit/PythonAPI/src/PythonModule.cpp
index 46e31b2c67a..4f0c9966299 100644
--- a/Fit/PythonAPI/src/PythonModule.cpp
+++ b/Fit/PythonAPI/src/PythonModule.cpp
@@ -5,37 +5,37 @@ GCC_DIAG_OFF(missing-field-initializers)
#include "boost/python.hpp"
GCC_DIAG_ON(unused-parameter)
GCC_DIAG_ON(missing-field-initializers)
-#include "IntensityFunctionSqrt.pypp.h"
-#include "MinimizerFactory.pypp.h"
-#include "IMinimizer.pypp.h"
-#include "FitOptions.pypp.h"
-#include "SquaredFunctionSystematicError.pypp.h"
-#include "IntensityNormalizer.pypp.h"
-#include "IIntensityFunction.pypp.h"
+#include "IChiSquaredModule.pypp.h"
+#include "ChiSquaredModule.pypp.h"
#include "INamed.pypp.h"
-#include "IntensityFunctionLog.pypp.h"
-#include "FitSuiteParameters.pypp.h"
+#include "IIntensityNormalizer.pypp.h"
+#include "FitObject.pypp.h"
+#include "FitOptions.pypp.h"
#include "FitParameter.pypp.h"
-#include "IntensityScaleAndShiftNormalizer.pypp.h"
-#include "IChiSquaredModule.pypp.h"
-#include "FitStrategyAdjustMinimizer.pypp.h"
#include "IFitStrategy.pypp.h"
+#include "FitStrategyAdjustMinimizer.pypp.h"
+#include "FitStrategyAdjustParameters.pypp.h"
+#include "FitStrategyDefault.pypp.h"
#include "FitStrategyFixParameters.pypp.h"
-#include "SquaredFunctionGaussianError.pypp.h"
-#include "IFitObserver.pypp.h"
-#include "IIntensityNormalizer.pypp.h"
+#include "FitStrategyReleaseParameters.pypp.h"
#include "FitSuite.pypp.h"
-#include "FitStrategyAdjustParameters.pypp.h"
-#include "ChiSquaredModule.pypp.h"
+#include "FitSuiteObjects.pypp.h"
+#include "FitSuiteParameters.pypp.h"
+#include "IFitObserver.pypp.h"
+#include "IIntensityFunction.pypp.h"
+#include "IMinimizer.pypp.h"
+#include "ISquaredFunction.pypp.h"
+#include "IntensityFunctionLog.pypp.h"
+#include "IntensityFunctionSqrt.pypp.h"
+#include "IntensityNormalizer.pypp.h"
+#include "IntensityScaleAndShiftNormalizer.pypp.h"
+#include "MinimizerFactory.pypp.h"
#include "MinimizerOptions.pypp.h"
#include "SquaredFunctionDefault.pypp.h"
+#include "SquaredFunctionGaussianError.pypp.h"
#include "SquaredFunctionMeanSquaredError.pypp.h"
-#include "ISquaredFunction.pypp.h"
-#include "FitStrategyDefault.pypp.h"
-#include "FitObject.pypp.h"
-#include "FitSuiteObjects.pypp.h"
#include "SquaredFunctionSimError.pypp.h"
-#include "FitStrategyReleaseParameters.pypp.h"
+#include "SquaredFunctionSystematicError.pypp.h"
BOOST_PYTHON_MODULE(libBornAgainFit){
boost::python::docstring_options doc_options(true, true, false);
diff --git a/GUI/coregui/Models/FitModel.cpp b/GUI/coregui/Models/FitModel.cpp
index ee4d89bd68b..5f91eae5c15 100644
--- a/GUI/coregui/Models/FitModel.cpp
+++ b/GUI/coregui/Models/FitModel.cpp
@@ -119,6 +119,7 @@ QString FitModel::getMinimizerAlgorithm() {
return item->getRegisteredProperty(MinimizerSettingsItem::P_ALGO).value<ComboProperty>()
.getValue();
}
+ return QString();
}
QString FitModel::getInputDataPath() {
diff --git a/GUI/coregui/Models/RectangularDetectorItem.h b/GUI/coregui/Models/RectangularDetectorItem.h
index 273ff23c6c0..a3d37b83a11 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.h
+++ b/GUI/coregui/Models/RectangularDetectorItem.h
@@ -17,7 +17,7 @@
#define RECTANGULARDETECTORITEM_H
#include "ParameterizedItem.h"
-#include "Types.h"
+#include "Vectors3D.h"
#include <memory>
class IDetector2D;
diff --git a/GUI/coregui/Models/VectorItem.h b/GUI/coregui/Models/VectorItem.h
index 0f910d5b403..1444ac8ddf9 100644
--- a/GUI/coregui/Models/VectorItem.h
+++ b/GUI/coregui/Models/VectorItem.h
@@ -17,7 +17,7 @@
#define VECTORITEM_H
#include "ParameterizedItem.h"
-#include "Types.h"
+#include "Vectors3D.h"
class BA_CORE_API_ VectorItem : public ParameterizedItem
{
--
GitLab