Commit 0f8a22b0 authored by Claudio Scafuri's avatar Claudio Scafuri 💬
Browse files

compiles on 18.04 with tango-9.4.0

parent 98dc99ac
NAME_SRV = cavity3hc-srv
include ../makefiles/Make-9.3.4.in
include ../makefiles/Make-9.4.0.in
......@@ -51,7 +51,7 @@ namespace Cavity3HC_ns
/*----- PROTECTED REGION ID(Cavity3HC::Additional Class Declarations) ENABLED START -----*/
// Additional Class Declarations
using namespace std;
/*----- PROTECTED REGION END -----*/ // Cavity3HC::Additional Class Declarations
class Cavity3HC : public TANGO_BASE_CLASS
......
......@@ -36,6 +36,15 @@
#include <Cavity3HCClass.h>
using namespace std;
#define cout1 if ((Tango::Util::_tracelevel >= 1) && \
(Tango::Util::_tracelevel < 5)) cout
#define cout2 if ((Tango::Util::_tracelevel >= 2) && \
(Tango::Util::_tracelevel < 5)) cout
#define cout3 if ((Tango::Util::_tracelevel >= 3) && \
(Tango::Util::_tracelevel < 5)) cout
#define cout4 if ((Tango::Util::_tracelevel >= 4) && \
(Tango::Util::_tracelevel < 5)) cout
/*----- PROTECTED REGION END -----*/ // Cavity3HCClass.cpp
......
......@@ -60,20 +60,20 @@ int main(int argc,char *argv[])
// Run the endless loop
//----------------------------------------
cout << "Ready to accept request" << endl;
std::cout << "Ready to accept request" << std::endl;
tg->server_run();
}
catch (bad_alloc &)
catch (std::bad_alloc &)
{
cout << "Can't allocate memory to store device object !!!" << endl;
cout << "Exiting" << endl;
std::cout << "Can't allocate memory to store device object !!!" << std::endl;
std::cout << "Exiting" << std::endl;
}
catch (CORBA::Exception &e)
{
Tango::Except::print_exception(e);
cout << "Received a CORBA_Exception" << endl;
cout << "Exiting" << endl;
std::cout << "Received a CORBA_Exception" << std::endl;
std::cout << "Exiting" << std::endl;
}
Tango::Util::instance()->server_cleanup();
return(0);
......
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