Replace NULL by nullptr

This commit is contained in:
Jan Möbius
2019-05-29 10:11:42 +02:00
parent f1b31421dd
commit b083f32a23
31 changed files with 84 additions and 84 deletions

View File

@@ -148,7 +148,7 @@ public:
/// Constructor
explicit CompositeT(Mesh& _mesh)
: subdiv_type_(0),
subdiv_rule_(NULL), /*first_rule_(NULL), last_rule_(NULL),*/ mesh_(_mesh)
subdiv_rule_(nullptr), /*first_rule_(nullptr), last_rule_(nullptr),*/ mesh_(_mesh)
{ }
///
@@ -161,7 +161,7 @@ public:
void cleanup(void)
{
subdiv_type_ = 0;
subdiv_rule_ = NULL;
subdiv_rule_ = nullptr;
std::for_each(rule_sequence_.begin(),
rule_sequence_.end(), DeleteRule() );

View File

@@ -96,8 +96,8 @@ public:
public:
CompositeT(void) : parent_t(), p_mesh_(NULL) {}
explicit CompositeT(MeshType& _mesh) : parent_t(_mesh), p_mesh_(NULL) {};
CompositeT(void) : parent_t(), p_mesh_(nullptr) {}
explicit CompositeT(MeshType& _mesh) : parent_t(_mesh), p_mesh_(nullptr) {};
virtual ~CompositeT() { }
public: // inherited interface
@@ -128,7 +128,7 @@ protected: // inherited interface
#endif
{
assert( p_mesh_ == &_m );
p_mesh_=NULL;
p_mesh_=nullptr;
return true;
}

View File

@@ -102,7 +102,7 @@ public:
/// Constructor to be used with interface 1 (calls attach())
/// \see operator()( MeshType&, size_t )
explicit SubdividerT( MeshType &_m ) : attached_(NULL) { attach(_m); }
explicit SubdividerT( MeshType &_m ) : attached_(nullptr) { attach(_m); }
//@}
@@ -157,7 +157,7 @@ public: /// \name Interface 2
if ( attached_ )
{
cleanup( *attached_ );
attached_ = NULL;
attached_ = nullptr;
}
}
//@}