Commit 48c30faa authored by Holger Witsch's avatar Holger Witsch

adapt to docker use

parent 78646bf2
......@@ -96,9 +96,9 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Communication/
//
// This file is generated by POGO
// This file is generated by POGO
// (Program Obviously used to Generate tango Object)
// (Program Obviously used to Generate tango Object)
//
......@@ -110,7 +110,7 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Communication/
#include <tango.h>
#include <tango/tango.h>
#include <SerialClass.h>
......@@ -118,13 +118,13 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Communication/
/**
* Create SerialClass singleton and store it in DServer object.
* Create SerialClass singleton and store it in DServer object.
*
* @author $Author: pascal_verdier $
* @author $Author: pascal_verdier $
* @version $Revision: 1.7 $ $
* @version $Revision: 1.7 $ $
*/
......@@ -136,10 +136,10 @@ void Tango::DServer::class_factory()
add_class(Serial_ns::SerialClass::init("Serial"));
add_class(Serial_ns::SerialClass::init("Serial"));
}
/*----- PROTECTED REGION END -----*/ // Serial::ClassFactory.cpp
/*----- PROTECTED REGION END -----*/ // Serial::ClassFactory.cpp
This diff is collapsed.
This diff is collapsed.
......@@ -62,7 +62,7 @@ static const char *RcsId = "$Id: main.cpp,v 1.7 2010-12-07 09:12:53 pascal_verdi
// (Program Obviously used to Generate tango Object)
//=============================================================================
#include <tango.h>
#include <tango/tango.h>
#if defined(ENABLE_CRASH_REPORT)
# include <crashreporting/crash_report.h>
......@@ -75,38 +75,38 @@ DECLARE_CRASH_HANDLER;
int main(int argc,char *argv[])
{
INSTALL_CRASH_HANDLER;
INSTALL_CRASH_HANDLER;
Tango::Util *tg = 0;
try
Tango::Util *tg = 0;
try
{
// Initialise the device server
//----------------------------------------
tg = Tango::Util::init(argc,argv);
{
// Initialise the device server
//----------------------------------------
tg = Tango::Util::init(argc,argv);
// Create the device server singleton
// which will create everything
//----------------------------------------
tg->server_init(false);
// Create the device server singleton
// which will create everything
//----------------------------------------
tg->server_init(false);
// Run the endless loop
//----------------------------------------
cout << "Ready to accept request" << endl;
tg->server_run();
}
catch (bad_alloc)
{
cout << "Can't allocate memory to store device object !!!" << endl;
cout << "Exiting" << endl;
}
catch (CORBA::Exception &e)
{
Tango::Except::print_exception(e);
cout << "Received a CORBA_Exception" << endl;
cout << "Exiting" << endl;
}
return(0);
// Run the endless loop
//----------------------------------------
cout << "Ready to accept request" << endl;
tg->server_run();
}
catch (bad_alloc)
{
cout << "Can't allocate memory to store device object !!!" << endl;
cout << "Exiting" << endl;
}
catch (CORBA::Exception &e)
{
Tango::Except::print_exception(e);
cout << "Received a CORBA_Exception" << endl;
cout << "Exiting" << endl;
}
return(0);
}
/*PROTECTED REGION END*/ // Serial::main.cpp
/*PROTECTED REGION END*/ // Serial::main.cpp
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment