diff --git a/libs/traverselib.h b/libs/traverselib.h index c90d01b5..d8479e35 100644 --- a/libs/traverselib.h +++ b/libs/traverselib.h @@ -166,7 +166,7 @@ void detach( Observer* observer ){ } /// \brief \copydoc scene::Traversable::insert() 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(); 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() 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(); ASSERT_MESSAGE( m_children.find( NodeSmartReference( node ) ) != m_children.end(), "TraversableNodeSet::erase - failed to find element" ); diff --git a/radiant/server.cpp b/radiant/server.cpp index ff168e5c..1540f6a4 100644 --- a/radiant/server.cpp +++ b/radiant/server.cpp @@ -63,7 +63,7 @@ DebugMessageHandler& getDebugMessageHandler(){ } 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 ) { globalErrorStream() << "module already registered: type=" << makeQuoted( type ) << " name=" << makeQuoted( name ) << "\n"; }