From 099e520ce5a608fe00cb9d921854b2d87966cde3 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 3 Jan 2017 16:40:38 +0100 Subject: Make the leader follower state a real enum instead of using it as int, that way a compiler can detect when we assign a non-existent value * TAO/tao/LF_CH_Event.cpp: * TAO/tao/LF_CH_Event.h: * TAO/tao/LF_Event.cpp: * TAO/tao/LF_Event.h: * TAO/tao/LF_Event.inl: * TAO/tao/LF_Invocation_Event.cpp: * TAO/tao/LF_Invocation_Event.h: * TAO/tao/LF_Multi_Event.cpp: * TAO/tao/LF_Multi_Event.h: * TAO/tests/Bug_3531b_Regression/server.cpp: --- TAO/tao/LF_CH_Event.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'TAO/tao/LF_CH_Event.cpp') diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp index 735041be0e4..ce68e95f94e 100644 --- a/TAO/tao/LF_CH_Event.cpp +++ b/TAO/tao/LF_CH_Event.cpp @@ -30,7 +30,7 @@ TAO_LF_CH_Event::unbind (TAO_LF_Follower *follower) } void -TAO_LF_CH_Event::state_changed_i (int new_state) +TAO_LF_CH_Event::state_changed_i (LFS_STATE new_state) { if (this->state_ != new_state) { @@ -64,7 +64,7 @@ TAO_LF_CH_Event::state_changed_i (int new_state) } void -TAO_LF_CH_Event::validate_state_change (int new_state) +TAO_LF_CH_Event::validate_state_change (LFS_STATE new_state) { if (this->state_ == TAO_LF_Event::LFS_IDLE) { @@ -128,7 +128,7 @@ TAO_LF_CH_Event::error_detected_i (void) const } void -TAO_LF_CH_Event::set_state (int new_state) +TAO_LF_CH_Event::set_state (LFS_STATE new_state) { // @@ NOTE: Is this still required? if (!this->is_state_final () -- cgit v1.2.1