smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 22:55:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix Wdeprecated, dynamic exception

Browse source 
Dynamic exception specifications are deprecated in C++11,
and were removed in C++17.
This commit is contained in:
Robin Gareus 2019-09-18 04:43:09 +02:00
parent bf806cde66
commit 60bce78c7e
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/evoral/evoral/SMF.hpp
View file

@ -37,8 +37,6 @@ typedef smf_tempo_struct smf_tempo_t;
namespace Evoral {
#define THROW_FILE_ERROR throw(FileError)
/** Standard Midi File.
* Currently only tempo-based time of a given PPQN is supported.
*
@ -66,10 +64,10 @@ public:
virtual ~SMF();
static bool test(const std::string& path);
int open(const std::string& path, int track=1) THROW_FILE_ERROR;
int open(const std::string& path, int track=1);
// XXX 19200 = 10 * Timecode::BBT_Time::ticks_per_beat
int create(const std::string& path, int track=1, uint16_t ppqn=19200) THROW_FILE_ERROR;
void close() THROW_FILE_ERROR;
int create(const std::string& path, int track=1, uint16_t ppqn=19200);
void close();
void seek_to_start() const;
int seek_to_track(int track);
@ -82,7 +80,7 @@ public:
void begin_write();
void append_event_delta(uint32_t delta_t, uint32_t size, const uint8_t* buf, event_id_t note_id);
void end_write(std::string const &) THROW_FILE_ERROR;
void end_write(std::string const &);
void flush() {};

8
libs/evoral/src/SMF.cpp
View file

@ -116,7 +116,7 @@ SMF::test(const std::string& path)
* -2 if the file exists but specified track does not exist
*/
int
SMF::open(const std::string& path, int track) THROW_FILE_ERROR
SMF::open(const std::string& path, int track)
{
Glib::Threads::Mutex::Lock lm (_smf_lock);
@ -187,7 +187,7 @@ SMF::open(const std::string& path, int track) THROW_FILE_ERROR
* -2 if the track can not be created
*/
int
SMF::create(const std::string& path, int track, uint16_t ppqn) THROW_FILE_ERROR
SMF::create(const std::string& path, int track, uint16_t ppqn)
{
Glib::Threads::Mutex::Lock lm (_smf_lock);
@ -243,7 +243,7 @@ SMF::create(const std::string& path, int track, uint16_t ppqn) THROW_FILE_ERROR
}
void
SMF::close() THROW_FILE_ERROR
SMF::close()
{
Glib::Threads::Mutex::Lock lm (_smf_lock);
@ -470,7 +470,7 @@ SMF::begin_write()
}
void
SMF::end_write(string const & path) THROW_FILE_ERROR
SMF::end_write(string const & path)
{
Glib::Threads::Mutex::Lock lm (_smf_lock);

4
libs/evoral/test/SMFTest.hpp
View file

@ -33,12 +33,12 @@ class TestSMF : public SMF {
public:
std::string path() const { return _path; }
int open(const std::string& path) THROW_FILE_ERROR {
int open(const std::string& path) {
_path = path;
return SMF::open(path);
}
void close() THROW_FILE_ERROR {
void close() {
return SMF::close();
}