Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DON'T MERGE: Replacing boost for std pointers (just core, for testing) TESTS CRASH #742

Closed
wants to merge 1 commit into from
Closed

DON'T MERGE: Replacing boost for std pointers (just core, for testing) TESTS CRASH #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kratos/containers/buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ class Buffer
is in charge of storing pointers correctly.
*/
template<class TDataType>
void push_back(boost::shared_ptr<TDataType> const& rValue)
void push_back(std::shared_ptr<TDataType> const& rValue)
{
KRATOS_THROW_ERROR(std::logic_error, "You cannot store a pointer in the buffer try the Serializer instead", "" );
}
Expand Down
2 changes: 1 addition & 1 deletion kratos/containers/pointer_hash_map_set.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace Kratos
template<class TDataType,
class THashType = boost::hash<TDataType>,
class TGetKeyType = SetIdentityFunction<TDataType>,
class TPointerType = boost::shared_ptr<TDataType> >
class TPointerType = std::shared_ptr<TDataType> >
class PointerHashMapSet
{

Expand Down
2 changes: 1 addition & 1 deletion kratos/containers/pointer_vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ namespace Kratos
deleting.
*/
template<class TDataType,
class TPointerType = boost::shared_ptr<TDataType>,
class TPointerType = std::shared_ptr<TDataType>,
class TContainerType = std::vector<TPointerType> >
class PointerVector
{
Expand Down
2 changes: 1 addition & 1 deletion kratos/containers/pointer_vector_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace Kratos
template<class TKeyType,class TDataType,

class TCompareType = std::less<TKeyType>,
class TPointerType = boost::shared_ptr<TDataType>,
class TPointerType = std::shared_ptr<TDataType>,
class TContainerType = std::vector<std::pair<TKeyType, TPointerType> > >
class PointerVectorMap
{
Expand Down
2 changes: 1 addition & 1 deletion kratos/containers/pointer_vector_set.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ template<class TDataType,
class TGetKeyType = SetIdentityFunction<TDataType>,
class TCompareType = std::less<typename TGetKeyType::result_type>,
class TEqualType = std::equal_to<typename TGetKeyType::result_type>,
class TPointerType = boost::shared_ptr<TDataType>,
class TPointerType = std::shared_ptr<TDataType>,
class TContainerType = std::vector<TPointerType> >
class PointerVectorSet
{
Expand Down
2 changes: 1 addition & 1 deletion kratos/containers/weak_pointer_vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace Kratos
deleting.
*/
template<class TDataType,
class TPointerType = boost::weak_ptr<TDataType>,
class TPointerType = std::weak_ptr<TDataType>,
class TContainerType = std::vector<TPointerType> >
class WeakPointerVector
{
Expand Down
2 changes: 1 addition & 1 deletion kratos/containers/weak_pointer_vector_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class WeakPointerVectorIterator

typename BaseType::reference dereference() const
{
return *(boost::shared_ptr<TDataType>(*(this->base())));
return *(std::shared_ptr<TDataType>(*(this->base())));
}

///@}
Expand Down
4 changes: 2 additions & 2 deletions kratos/geometries/geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,15 @@ class Geometry : public PointerVector<TPointType>
*i = typename PointType::Pointer( new PointType( **i ) );
}

virtual boost::shared_ptr< Geometry< Point<3> > > Clone() const
virtual std::shared_ptr< Geometry< Point<3> > > Clone() const
{
Geometry< Point<3> >::PointsArrayType NewPoints;

//making a copy of the nodes TO POINTS (not Nodes!!!)

for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i]));
NewPoints.push_back(std::make_shared< Point<3> >((*this)[i]));
}

//NewPoints[i] = typename Point<3>::Pointer(new Point<3>(*mPoints[i]));
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/hexahedra_3d_20.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ template<class TPointType> class Hexahedra3D20 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i]));
NewPoints.push_back(std::make_shared< Point<3> >((*this)[i]));
}


Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/hexahedra_3d_27.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ template<class TPointType> class Hexahedra3D27 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i]));
NewPoints.push_back(std::make_shared< Point<3> >((*this)[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/hexahedra_3d_8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ template<class TPointType> class Hexahedra3D8 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i]));
NewPoints.push_back(std::make_shared< Point<3> >((*this)[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/hexahedra_interface_3d_8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ template<class TPointType> class HexahedraInterface3D8 : public Geometry<TPointT
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i]));
NewPoints.push_back(std::make_shared< Point<3> >((*this)[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/line_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class Line2D : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/line_2d_2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ class Line2D2 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i]));
NewPoints.push_back(std::make_shared< Point<3> >((*this)[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/line_2d_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ class Line2D3 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i]));
NewPoints.push_back(std::make_shared< Point<3> >((*this)[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/line_3d_2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class Line3D2 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/line_3d_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ class Line3D3 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/line_gl_3d_2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ class LineGL3D2 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)

for ( IndexType i = 0 ; i < BaseType::Points().size() ; i++ )
NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i]));
NewPoints.push_back(std::make_shared< Point<3> >((*this)[i]));

//creating a geometry with the new points
Geometry< Point<3> >::Pointer p_clone( new LineGL3D2< Point<3> >( NewPoints ) );
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/point_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class Point2D : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/point_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class Point3D : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/prism_3d_15.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ template<class TPointType> class Prism3D15 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/prism_3d_6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ template<class TPointType> class Prism3D6 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/prism_interface_3d_6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ template<class TPointType> class PrismInterface3D6
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
10 changes: 5 additions & 5 deletions kratos/geometries/quadrilateral_2d_4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ template<class TPointType> class Quadrilateral2D4
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down Expand Up @@ -504,10 +504,10 @@ template<class TPointType> class Quadrilateral2D4
GeometriesArrayType Edges( void ) override
{
GeometriesArrayType edges = GeometriesArrayType();
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 3 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 0 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 3 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 0 ) ) );
return edges;
}

Expand Down
10 changes: 5 additions & 5 deletions kratos/geometries/quadrilateral_2d_8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ template<class TPointType> class Quadrilateral2D8
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down Expand Up @@ -930,10 +930,10 @@ template<class TPointType> class Quadrilateral2D8
GeometriesArrayType Edges( void ) override
{
GeometriesArrayType edges = GeometriesArrayType();
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) );
return edges;
}

Expand Down
10 changes: 5 additions & 5 deletions kratos/geometries/quadrilateral_2d_9.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ template<class TPointType> class Quadrilateral2D9 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down Expand Up @@ -486,10 +486,10 @@ template<class TPointType> class Quadrilateral2D9 : public Geometry<TPointType>
GeometriesArrayType Edges( void ) override
{
GeometriesArrayType edges = GeometriesArrayType();
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) );
return edges;
}

Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/quadrilateral_3d_4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ template<class TPointType> class Quadrilateral3D4
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
10 changes: 5 additions & 5 deletions kratos/geometries/quadrilateral_3d_8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ template<class TPointType> class Quadrilateral3D8
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down Expand Up @@ -995,10 +995,10 @@ template<class TPointType> class Quadrilateral3D8
GeometriesArrayType Edges( void ) override
{
GeometriesArrayType edges = GeometriesArrayType();
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) );
return edges;
}

Expand Down
10 changes: 5 additions & 5 deletions kratos/geometries/quadrilateral_3d_9.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ template<class TPointType> class Quadrilateral3D9 : public Geometry<TPointType>
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down Expand Up @@ -988,10 +988,10 @@ template<class TPointType> class Quadrilateral3D9 : public Geometry<TPointType>
GeometriesArrayType Edges( void ) override
{
GeometriesArrayType edges = GeometriesArrayType();
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) );
return edges;
}

Expand Down
10 changes: 5 additions & 5 deletions kratos/geometries/quadrilateral_interface_2d_4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ template<class TPointType> class QuadrilateralInterface2D4
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down Expand Up @@ -859,10 +859,10 @@ template<class TPointType> class QuadrilateralInterface2D4
GeometriesArrayType Edges( void ) override
{
GeometriesArrayType edges = GeometriesArrayType();
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 3 ) ) );
edges.push_back( boost::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 0 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 2 ), this->pGetPoint( 3 ) ) );
edges.push_back( std::make_shared<EdgeType>( this->pGetPoint( 3 ), this->pGetPoint( 0 ) ) );
return edges;
}

Expand Down
2 changes: 1 addition & 1 deletion kratos/geometries/quadrilateral_interface_3d_4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ template<class TPointType> class QuadrilateralInterface3D4
//making a copy of the nodes TO POINTS (not Nodes!!!)
for ( IndexType i = 0 ; i < this->size() ; i++ )
{
NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i]));
NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i]));
}

//creating a geometry with the new points
Expand Down
Loading