From 40816ddc65b8d3a15821c76f23075706f98053a5 Mon Sep 17 00:00:00 2001 From: Keenan Lang Date: Mon, 25 Jul 2016 14:38:38 -0500 Subject: [PATCH] Revert "Switched motor status and statusChanged to be protected instead of private." This reverts commit 36ff229c44b8273cd7c4967a13eb64a24f73d37d. --- motorApp/MotorSrc/asynMotorAxis.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/motorApp/MotorSrc/asynMotorAxis.h b/motorApp/MotorSrc/asynMotorAxis.h index fea0748c..7cdc2544 100644 --- a/motorApp/MotorSrc/asynMotorAxis.h +++ b/motorApp/MotorSrc/asynMotorAxis.h @@ -72,10 +72,10 @@ class epicsShareClass asynMotorAxis { double *profileReadbacks_; /**< Array of readback positions for profile moves */ double *profileFollowingErrors_; /**< Array of following errors for profile moves */ int referencingMode_; + + private: MotorStatus status_; int statusChanged_; - - private: int referencingModeMove_; int wasMovingFlag_; int disableFlag_;