From 00798cd4330156df3bac67691958a0b15a4dcedc Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Tue, 11 Mar 2014 23:09:12 +0000 Subject: [PATCH] Added epicsShareClass to export classes on Windows; minor changes to eliminate compiler warnings --- motorApp/MotorSimSrc/motorSimDriver.cpp | 12 ++++++------ motorApp/MotorSimSrc/motorSimDriver.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/motorApp/MotorSimSrc/motorSimDriver.cpp b/motorApp/MotorSimSrc/motorSimDriver.cpp index 9fbd6381..cb3d2f23 100644 --- a/motorApp/MotorSimSrc/motorSimDriver.cpp +++ b/motorApp/MotorSimSrc/motorSimDriver.cpp @@ -22,8 +22,11 @@ December 13, 2009 #include #include -#include "motorSimDriver.h" +#include "asynMotorController.h" +#include "asynMotorAxis.h" + #include +#include "motorSimDriver.h" #define DEFAULT_LOW_LIMIT -10000 #define DEFAULT_HI_LIMIT 10000 @@ -76,7 +79,6 @@ motorSimController::motorSimController(const char *portName, int numAxes, int pr priority, stackSize) { int axis; - motorSimAxis *pAxis; motorSimControllerNode *pNode; if (!motorSimControllerListInitialized) { @@ -94,7 +96,7 @@ motorSimController::motorSimController(const char *portName, int numAxes, int pr numAxes_ = numAxes; this->movesDeferred_ = 0; for (axis=0; axismotorPosition_, DEFAULT_START); } @@ -448,9 +450,7 @@ void motorSimAxis::process(double delta ) /** Configuration command, called directly or from iocsh */ extern "C" int motorSimCreateController(const char *portName, int numAxes, int priority, int stackSize) { - motorSimController *pSimController - = new motorSimController(portName,numAxes, priority, stackSize); - pSimController = NULL; + new motorSimController(portName,numAxes, priority, stackSize); return(asynSuccess); } diff --git a/motorApp/MotorSimSrc/motorSimDriver.h b/motorApp/MotorSimSrc/motorSimDriver.h index 6504a700..9457c4ac 100644 --- a/motorApp/MotorSimSrc/motorSimDriver.h +++ b/motorApp/MotorSimSrc/motorSimDriver.h @@ -19,7 +19,7 @@ March 28, 2010 #define NUM_SIM_CONTROLLER_PARAMS 0 -class motorSimAxis : public asynMotorAxis +class epicsShareClass motorSimAxis : public asynMotorAxis { public: @@ -56,7 +56,7 @@ private: friend class motorSimController; }; -class motorSimController : asynMotorController { +class epicsShareClass motorSimController : asynMotorController { public: /* These are the fucntions we override from the base class */