Skip to content

Commit

Permalink
Merge pull request #4711 from dmitripivkine/master
Browse files Browse the repository at this point in the history
Fix compilation warning and typo
  • Loading branch information
keithc-ca authored Feb 12, 2019
2 parents 3d27662 + b6b7ca2 commit 234af02
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion runtime/gc_glue_java/MetronomeAlarmThreadDelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ MM_MetronomeAlarmThreadDelegate::metronomeAlarmThreadWrapper(void* userData)
&rc);

omrthread_monitor_enter(alarmThread->_mutex);
alarmThread->_alarmThreadActive = MM_MetronomeAlarmThread::AlarmThradActive::ALARM_THREAD_SHUTDOWN;
alarmThread->_alarmThreadActive = MM_MetronomeAlarmThread::ALARM_THREAD_SHUTDOWN;
omrthread_monitor_notify(alarmThread->_mutex);
omrthread_exit(alarmThread->_mutex);

Expand Down
4 changes: 2 additions & 2 deletions runtime/gc_realtime/MetronomeAlarmThread.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ class MM_MetronomeAlarmThread : public MM_BaseVirtual
MM_Alarm *_alarm;
omrthread_monitor_t _mutex;
volatile bool _shutdown;
enum AlarmThradActive {
enum AlarmThreadActive {
ALARM_THREAD_INACTIVE,
ALARM_THREAD_ACTIVE,
ALARM_THREAD_SHUTDOWN
};
volatile AlarmThradActive _alarmThreadActive;
volatile AlarmThreadActive _alarmThreadActive;
MM_Scheduler *_scheduler;

protected:
Expand Down

0 comments on commit 234af02

Please sign in to comment.