From c883cfea3f586a0e77cf07a39549efb89fd713fb Mon Sep 17 00:00:00 2001
From: Thomas Juerges <thomas.juerges@skao.int>
Date: Mon, 17 Jun 2024 15:09:23 +0900
Subject: [PATCH] Remove exception specs for C++17
---
src/AlarmHandler.cpp | 6 +++---
src/AlarmHandler.h | 8 ++++----
src/event_table.cpp | 4 ++--
src/event_table.h | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/AlarmHandler.cpp b/src/AlarmHandler.cpp
index 36a0fad..274f4b5 100644
--- a/src/AlarmHandler.cpp
+++ b/src/AlarmHandler.cpp
@@ -3469,7 +3469,7 @@ void AlarmHandler::add_alarm(alarm_t& a, bool starting)
}
}
-void AlarmHandler::add_event(alarm_t& a, vector<string> &evn) throw(string&)
+void AlarmHandler::add_event(alarm_t& a, vector<string> &evn)
{
DEBUG_STREAM << "AlarmHandler::add_event(): formula '" << a.formula << "' found " << evn.size() << " events" << endl;
/*
@@ -4217,7 +4217,7 @@ void AlarmHandler::timer_update()
}
}
-bool AlarmHandler::remove_alarm(string& s) throw(string&)
+bool AlarmHandler::remove_alarm(string& s)
{
DEBUG_STREAM << "AlarmHandler::"<<__func__<<": entering alm name=" << s << endl;
alarms.vlock->writerIn();
@@ -4327,7 +4327,7 @@ bool AlarmHandler::remove_alarm(string& s) throw(string&)
} /* remove_alarm() */
-/*void AlarmHandler::add_to_database(alarm_t& a) throw(string&)
+/*void AlarmHandler::add_to_database(alarm_t& a)
{
Tango::DbDatum alarm("alarm");
Tango::DbData db_data;
diff --git a/src/AlarmHandler.h b/src/AlarmHandler.h
index 1d96b08..1f0fe2e 100644
--- a/src/AlarmHandler.h
+++ b/src/AlarmHandler.h
@@ -593,13 +593,13 @@ private:
void init_alarms(map< string,vector<string> > &alarm_events);
#endif
void add_alarm(alarm_t& a, bool starting=false);
- void add_event(alarm_t& a, vector<string> &evn) throw(string&);
+ void add_event(alarm_t& a, vector<string> &evn);
#if 0
- void subscribe_event(alarm_t& a, EventCallBack& ecb, vector<string> &evn) throw(string&);
+ void subscribe_event(alarm_t& a, EventCallBack& ecb, vector<string> &evn);
#endif
// void do_alarm(bei_t& e); //gcc 4 problem??
- bool remove_alarm(string& s) throw(string&);
- //void add_to_database(alarm_t& a) throw(string&);
+ bool remove_alarm(string& s);
+ //void add_to_database(alarm_t& a);
void set_internal_alarm(string name, Tango::TimeVal t, string msg, unsigned int count=1);
void load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn);
diff --git a/src/event_table.cpp b/src/event_table.cpp
index 5de976d..2a19323 100644
--- a/src/event_table.cpp
+++ b/src/event_table.cpp
@@ -385,7 +385,7 @@ void event_table::free_proxy(void)
}
}
-void event_table::subscribe(EventCallBack& ecb) throw(vector<string> &)//throw(string&)
+void event_table::subscribe(EventCallBack& ecb)
{
vector<string> subscribe_error;
if (v_event.empty() == false) {
@@ -409,7 +409,7 @@ void event_table::subscribe(EventCallBack& ecb) throw(vector<string> &)//throw(s
throw subscribe_error;
}
-void event_table::unsubscribe(void) throw(string&)
+void event_table::unsubscribe(void)
{
ostringstream o;
if (v_event.empty() == false) {
diff --git a/src/event_table.h b/src/event_table.h
index 24220d8..764369b 100644
--- a/src/event_table.h
+++ b/src/event_table.h
@@ -154,8 +154,8 @@ class event_table : public Tango::TangoMonitor, public Tango::LogAdapter {
#if 0
void init_proxy(void) throw(vector<string> &);
void free_proxy(void);
- void subscribe(EventCallBack& ecb) throw(vector<string> &);//throw(string&);
- void unsubscribe(void) throw(string&);
+ void subscribe(EventCallBack& ecb);
+ void unsubscribe(void);
#endif
/**
* Add a new signal.
--
GitLab