diff --git a/MAC/APL/_GSO/MACScheduler/configure.in b/MAC/APL/_GSO/MACScheduler/configure.in index 616c83318ac72b684ffefc98b48dc2ce1dec68a8..3ee9e575200b56fef64addb7bd39dbacab1a0f4e 100644 --- a/MAC/APL/_GSO/MACScheduler/configure.in +++ b/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) diff --git a/MAC/APL/_GSO/MACScheduler/src/MACScheduler.h b/MAC/APL/_GSO/MACScheduler/src/MACScheduler.h index 94b46bd1375ab0ee4cd7fc73d3ca19f28f5356ee..553d3d9b0fc7fe9788729a6ec4ab282f632b5523 100644 --- a/MAC/APL/_GSO/MACScheduler/src/MACScheduler.h +++ b/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);