quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 'might be considered always true' warning

Browse Source
This commit is contained in:
Garux 2019-02-22 23:53:39 +03:00
parent 07d3008b96
commit 7c2d05f399
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/traverselib.h
View File

@ -166,7 +166,7 @@ void detach( Observer* observer ){
} }
/// \brief \copydoc scene::Traversable::insert() /// \brief \copydoc scene::Traversable::insert()
void insert( scene::Node& node ){ void insert( scene::Node& node ){
ASSERT_MESSAGE( &node != 0, "TraversableNodeSet::insert: sanity check failed" ); ASSERT_MESSAGE( (volatile intptr_t)&node != 0, "TraversableNodeSet::insert: sanity check failed" );
m_undo.save(); m_undo.save();
ASSERT_MESSAGE( m_children.find( NodeSmartReference( node ) ) == m_children.end(), "TraversableNodeSet::insert - element already exists" ); ASSERT_MESSAGE( m_children.find( NodeSmartReference( node ) ) == m_children.end(), "TraversableNodeSet::insert - element already exists" );
@ -179,7 +179,7 @@ void insert( scene::Node& node ){
} }
/// \brief \copydoc scene::Traversable::erase() /// \brief \copydoc scene::Traversable::erase()
void erase( scene::Node& node ){ void erase( scene::Node& node ){
ASSERT_MESSAGE( &node != 0, "TraversableNodeSet::erase: sanity check failed" ); ASSERT_MESSAGE( (volatile intptr_t)&node != 0, "TraversableNodeSet::erase: sanity check failed" );
m_undo.save(); m_undo.save();
ASSERT_MESSAGE( m_children.find( NodeSmartReference( node ) ) != m_children.end(), "TraversableNodeSet::erase - failed to find element" ); ASSERT_MESSAGE( m_children.find( NodeSmartReference( node ) ) != m_children.end(), "TraversableNodeSet::erase - failed to find element" );

2
radiant/server.cpp
View File

@ -63,7 +63,7 @@ DebugMessageHandler& getDebugMessageHandler(){
} }
void registerModule( const char* type, int version, const char* name, Module& module ){ void registerModule( const char* type, int version, const char* name, Module& module ){
ASSERT_NOTNULL( &module ); ASSERT_NOTNULL( (volatile intptr_t)&module );
if ( !m_modules.insert( Modules_::value_type( ModuleKey( ModuleType( type, version ), name ), &module ) ).second ) { if ( !m_modules.insert( Modules_::value_type( ModuleKey( ModuleType( type, version ), name ), &module ) ).second ) {
globalErrorStream() << "module already registered: type=" << makeQuoted( type ) << " name=" << makeQuoted( name ) << "\n"; globalErrorStream() << "module already registered: type=" << makeQuoted( type ) << " name=" << makeQuoted( name ) << "\n";
} }