Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions models/correlospinmatrix_detector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,10 @@ nest::correlospinmatrix_detector::State_::reset( const Parameters_& p )
last_change_.clear();
last_change_.resize( p.N_channels_ );

for ( long i = 0; i < p.N_channels_; ++i )
for ( size_t i = 0; i < p.N_channels_; ++i )
{
count_covariance_[ i ].resize( p.N_channels_ );
for ( long j = 0; j < p.N_channels_; ++j )
for ( size_t j = 0; j < p.N_channels_; ++j )
{
count_covariance_[ i ][ j ].resize( 1 + 2.0 * p.tau_max_.get_steps() / p.delta_tau_.get_steps(), 0 );
}
Expand Down
2 changes: 1 addition & 1 deletion models/ht_neuron.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ void
nest::ht_neuron::handle( SpikeEvent& e )
{
assert( e.get_delay_steps() > 0 );
assert( e.get_rport() < static_cast< int >( B_.spike_inputs_.size() ) );
assert( e.get_rport() < B_.spike_inputs_.size() );

B_.spike_inputs_[ e.get_rport() ].add_value(
e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() ), e.get_weight() * e.get_multiplicity() );
Expand Down
4 changes: 2 additions & 2 deletions nestkernel/archiving_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ nest::ArchivingNode::set_spiketime( Time const& t_sp, double offset )
{
const double next_t_sp = history_[ 1 ].t_;
if ( history_.front().access_counter_ >= n_incoming_
and t_sp_ms - next_t_sp
> max_delay_ + kernel().connection_manager.get_min_delay() + kernel().connection_manager.get_stdp_eps() )
and t_sp_ms - next_t_sp > max_delay_ + Time::delay_steps_to_ms( kernel().connection_manager.get_min_delay() )
+ kernel().connection_manager.get_stdp_eps() )
{
history_.pop_front();
}
Expand Down
2 changes: 1 addition & 1 deletion nestkernel/conn_builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@ nest::FixedTotalNumberBuilder::connect_()

try
{
const int vp_id = kernel().vp_manager.thread_to_vp( tid );
const size_t vp_id = kernel().vp_manager.thread_to_vp( tid );

if ( kernel().vp_manager.is_local_vp( vp_id ) )
{
Expand Down
6 changes: 3 additions & 3 deletions nestkernel/source_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ nest::SourceTable::clean( const size_t tid )
// delete part of the sources table, with indices larger than those
// in max_position; if this thread is larger than max_positions's
// thread, we can delete all sources; otherwise we do nothing.
if ( max_position.tid == tid )
if ( max_position.tid == static_cast< long >( tid ) )
{
for ( synindex syn_id = max_position.syn_id; syn_id < sources_[ tid ].size(); ++syn_id )
{
Expand All @@ -143,14 +143,14 @@ nest::SourceTable::clean( const size_t tid )
}
}
}
else if ( max_position.tid < tid )
else if ( max_position.tid < static_cast< long >( tid ) )
{
sources_[ tid ].clear();
}
else
{
// do nothing
assert( tid < max_position.tid );
assert( static_cast< long >( tid ) < max_position.tid );
}
}

Expand Down
Loading