Commit 42caf2cc authored by Marco De Marco's avatar Marco De Marco
Browse files

Minor change in connection manager, dmdb importer and event buffer

parent 497903ed

src/ConnectionManager.cpp

+5 −5
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ namespace FitsImporter_ns 
//=============================================================================

//	ConnectionManager::ConnectionManager()

//=============================================================================

ConnectionManager::ConnectionManager(Tango::DeviceImpl* device_impl_p, 

ConnectionManager::ConnectionManager(Tango::DeviceImpl* deviceImpl_p, 

	Configuration::SP configuration_sp, Instrument::SPVector instrument_spvector)

	throw(std::runtime_error) : Tango::LogAdapter(device_impl_p)

	throw(std::runtime_error) : Tango::LogAdapter(deviceImpl_p)

{

    DEBUG_STREAM << "ConnectionManager::ConnectionManager()" << endl;
@@ -86,11 +86,11 @@ ConnectionManager::~ConnectionManager() 
//=============================================================================

//	ConnectionManager::create()

//=============================================================================

ConnectionManager::SP ConnectionManager::create(Tango::DeviceImpl* device_impl_p,

ConnectionManager::SP ConnectionManager::create(Tango::DeviceImpl* deviceImpl_p,

	Configuration::SP configuration_sp, Instrument::SPVector instrument_spvector)

	throw(std::runtime_error)

{

	ConnectionManager::SP c_sp(new ConnectionManager(device_impl_p,

	ConnectionManager::SP c_sp(new ConnectionManager(deviceImpl_p,

        configuration_sp, instrument_spvector), ConnectionManager::Deleter());



	return c_sp;

src/DMDBImporter.cpp

+4 −4
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ namespace FitsImporter_ns 
//==============================================================================

//      DMDBImporter::DMDBImporter()

//==============================================================================

DMDBImporter::DMDBImporter(Tango::DeviceImpl* device_impl_p,

DMDBImporter::DMDBImporter(Tango::DeviceImpl* deviceImpl_p,

    std::string host, unsigned short port, std::string user, std::string password, 

    std::string schema, std::string instrumentTable, std::string destinationTable,

    std::string mappingTable) : Tango::LogAdapter(device_impl_p), m_host(host),

    std::string mappingTable) : Tango::LogAdapter(deviceImpl_p), m_host(host),

    m_port(port), m_user(user), m_password(password), m_schema(schema),

    m_instrumentTable(instrumentTable), m_destinationTable(destinationTable), 

    m_mappingTable(mappingTable)
@@ -39,12 +39,12 @@ DMDBImporter::~DMDBImporter() 
//==============================================================================

//      DMDBImporter::create()

//==============================================================================

DMDBImporter::SP DMDBImporter::create(Tango::DeviceImpl* device_impl_p, 

DMDBImporter::SP DMDBImporter::create(Tango::DeviceImpl* deviceImpl_p, 

    std::string host, unsigned short port, std::string user, std::string password, 

    std::string schema, std::string instrumentTable, std::string destinationTable, 

    std::string mappingTable)     

{

    DMDBImporter::SP d_sp(new DMDBImporter(device_impl_p, host, port, 

    DMDBImporter::SP d_sp(new DMDBImporter(deviceImpl_p, host, port, 

        user, password, schema, instrumentTable, destinationTable, mappingTable), 

        DMDBImporter::Deleter());

src/EventBuffer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ namespace FitsImporter_ns 
//==============================================================================

//	EventBuffer::EventBuffer()

//==============================================================================

EventBuffer::EventBuffer(Tango::DeviceImpl* device_impl_p) :

	Tango::LogAdapter(device_impl_p)

EventBuffer::EventBuffer(Tango::DeviceImpl* deviceImpl_p) :

	Tango::LogAdapter(deviceImpl_p)

{

		DEBUG_STREAM << "EventBuffer::EventBuffer()" << endl;

}
@@ -25,9 +25,9 @@ EventBuffer::~EventBuffer() 
//==============================================================================

//	EventBuffer::insertNew()

//==============================================================================

EventBuffer::SP EventBuffer::create(Tango::DeviceImpl* device_impl_p)

EventBuffer::SP EventBuffer::create(Tango::DeviceImpl* deviceImpl_p)

{

    EventBuffer::SP e_sp(new EventBuffer(device_impl_p),

    EventBuffer::SP e_sp(new EventBuffer(deviceImpl_p),

        EventBuffer::Deleter());

    

    return e_sp;