Skip to content
Snippets Groups Projects
Commit 3cac572e authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Merge branch 'centos_7_compatibility' of https://github.com/discos/discos into srt-new-minor-servos

parents e6601d4a 1c47fe51
Branches
No related tags found
No related merge requests found
...@@ -55,10 +55,10 @@ class ComponentProxy ...@@ -55,10 +55,10 @@ class ComponentProxy
ComponentProxy(); ComponentProxy();
ComponentProxy(const char*, maci::ContainerServices*); ComponentProxy(const char*, maci::ContainerServices*);
virtual ~ComponentProxy(); virtual ~ComponentProxy();
void loadDefault() throw (ComponentErrors::CouldntGetComponentExImpl); void loadDefault(); //throw (ComponentErrors::CouldntGetComponentExImpl);
void unload(); void unload();
//ComponentVar getComponentVar(){ return m_component_var;}; //ComponentVar getComponentVar(){ return m_component_var;};
ComponentVar& operator->() throw (ComponentErrors::CouldntGetComponentExImpl); ComponentVar& operator->(); //throw (ComponentErrors::CouldntGetComponentExImpl);
void setError(){ m_error = true;}; void setError(){ m_error = true;};
void resetError(){ m_error = false;}; void resetError(){ m_error = false;};
bool isError(){ return m_error;}; bool isError(){ return m_error;};
...@@ -103,7 +103,7 @@ ComponentProxy<ComponentClass, ComponentVar>::~ComponentProxy() ...@@ -103,7 +103,7 @@ ComponentProxy<ComponentClass, ComponentVar>::~ComponentProxy()
template <typename ComponentClass, typename ComponentVar> template <typename ComponentClass, typename ComponentVar>
void void
ComponentProxy<ComponentClass, ComponentVar>::loadDefault() ComponentProxy<ComponentClass, ComponentVar>::loadDefault()
throw (ComponentErrors::CouldntGetComponentExImpl) //throw (ComponentErrors::CouldntGetComponentExImpl)
{ {
if(m_name == "") if(m_name == "")
{ {
...@@ -230,7 +230,7 @@ ComponentProxy<ComponentClass, ComponentVar>::setContainerServices( ...@@ -230,7 +230,7 @@ ComponentProxy<ComponentClass, ComponentVar>::setContainerServices(
template <typename ComponentClass, typename ComponentVar> template <typename ComponentClass, typename ComponentVar>
ComponentVar& ComponentVar&
ComponentProxy<ComponentClass, ComponentVar>::operator->() ComponentProxy<ComponentClass, ComponentVar>::operator->()
throw (ComponentErrors::CouldntGetComponentExImpl) //throw (ComponentErrors::CouldntGetComponentExImpl)
{ {
loadDefault(); loadDefault();
//return m_component_var.out(); //return m_component_var.out();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment