summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2018-08-01 19:38:25 +0200
committerMax Kellermann <max@musicpd.org>2018-08-01 20:16:40 +0200
commit95acc4be076f4147c42c4e0ab2968bbf6bb80fc7 (patch)
tree3484cf1e7febb4bfc5457c4ce191f03852a5b893 /src
parent330a4cf573e23eb264cdb54e1a4e97f0834c8db6 (diff)
Main: add "noexcept"
Diffstat (limited to 'src')
-rw-r--r--src/Main.cxx8
-rw-r--r--src/Main.hxx3
2 files changed, 7 insertions, 4 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index 49f3ea731..f96146336 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -433,7 +433,8 @@ Instance::OnIdle(unsigned flags)
#ifndef ANDROID
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[]) noexcept
{
#ifdef _WIN32
return win32_main(argc, argv);
@@ -445,7 +446,8 @@ int main(int argc, char *argv[])
#endif
static int
-mpd_main_after_fork(const ConfigData &raw_config, const Config &config);
+mpd_main_after_fork(const ConfigData &raw_config,
+ const Config &config);
static inline int
MainOrThrow(int argc, char *argv[])
@@ -533,7 +535,7 @@ MainOrThrow(int argc, char *argv[])
#ifdef ANDROID
static inline
#endif
-int mpd_main(int argc, char *argv[])
+int mpd_main(int argc, char *argv[]) noexcept
{
AtScopeExit() { log_deinit(); };
diff --git a/src/Main.hxx b/src/Main.hxx
index 9b41abf9f..8fb267919 100644
--- a/src/Main.hxx
+++ b/src/Main.hxx
@@ -38,7 +38,8 @@ extern Instance *instance;
* On Windows platform this is called from win32_main()
* after doing some initialization.
*/
-int mpd_main(int argc, char *argv[]);
+int
+mpd_main(int argc, char *argv[]) noexcept;
#endif