Unverified Commit 9059811c authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #769, update for CGG 8.3.1 (#770)

parent 6e1de8fa

Common/Servers/FitsWriter/src/FitsTools.cpp

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ CCfits::Table *CFitsTools::createTable(CCfits::FITS *const fits,const IRA::CStri 
	CCfits::Table *table;

	if (!fits) {

		errorMessage="fits file is not created";

		return false;

		return NULL;

	}

	try {

		table=fits->addTable((const char *)name,0,colName,colForm,colUnit);

SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossSectorThread.cpp

+3 −4
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ void CSRTActiveSurfaceBossSectorThread::onStop() 


void CSRTActiveSurfaceBossSectorThread::runLoop()

{

    char serial_usd[23];

    char graf[5], mecc[4];

    std::string serial_usd, graf, mecc;

    int lanIndex;

    int circleIndex;

    int usdCircleIndex;
@@ -70,12 +69,12 @@ void CSRTActiveSurfaceBossSectorThread::runLoop() 


        try

        {

            current_usd = m_boss->m_services->getComponent<ActiveSurface::USD>(serial_usd);

            current_usd = m_boss->m_services->getComponent<ActiveSurface::USD>(serial_usd.c_str());

        }

        catch (maciErrType::CannotGetComponentExImpl& ex)

        {

            _ADD_BACKTRACE(ComponentErrors::CouldntGetComponentExImpl,Impl,ex,std::string(m_thread_name + "::runLoop()").c_str());

            Impl.setComponentName(serial_usd);

            Impl.setComponentName(serial_usd.c_str());

            Impl.log(LM_DEBUG);

        }