BugID: 366

APLCommon enums moved from protocol file to APL_Defines.h header file

MAC/APL/_GSO/MACScheduler/configure.in

@@ -5,7 +5,7 @@ AC_INIT
 dnl AC_CONFIG_AUX_DIR(config)
 dnl AM_CONFIG_HEADER(config/config.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MACScheduler, 3.1)
+AM_INIT_AUTOMAKE(MACScheduler, 3.1, no-define)
 
 dnl
 dnl Initialize for LOFAR (may set compilers)

MAC/APL/_GSO/MACScheduler/src/MACScheduler.h

@@ -143,8 +143,8 @@ namespace GSO
       string _getVInameFromPort(const GCF::TM::GCFPortInterface& port) const;
       string _getShareLocation() const;
       void _handleSASprotocol(GCF::TM::GCFEvent& event, GCF::TM::GCFPortInterface& port);
-      TSASResult _LDtoSASresult(const TLDResult& ldResult);
-      TSASResult _SDtoSASresult(const TSDResult& sdResult);
+      TSASResult _LDtoSASresult(const APLCommon::TLDResult& ldResult);
+      TSASResult _SDtoSASresult(const APLCommon::TSDResult& sdResult);
 
       void _convertRelativeTimes(boost::shared_ptr<ACC::APS::ParameterSet> ps);
       void _convertRelativeTimesChild(string child, boost::shared_ptr<ACC::APS::ParameterSet> ps);