From 3315c67f0f06d49f69f3b02bdabefd04542872df Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 20 Oct 2013 13:51:55 +0200 Subject: Inotify: convert anonymous enum to constexpr --- src/InotifyQueue.cxx | 14 ++++++-------- src/InotifyUpdate.cxx | 9 ++++----- test/run_inotify.cxx | 9 ++++----- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/InotifyQueue.cxx b/src/InotifyQueue.cxx index 28b60ebee..c24816241 100644 --- a/src/InotifyQueue.cxx +++ b/src/InotifyQueue.cxx @@ -26,14 +26,12 @@ #include -enum { - /** - * Wait this long after the last change before calling - * update_enqueue(). This increases the probability that - * updates can be bundled. - */ - INOTIFY_UPDATE_DELAY_S = 5, -}; +/** + * Wait this long after the last change before calling + * update_enqueue(). This increases the probability that updates can + * be bundled. + */ +static constexpr unsigned INOTIFY_UPDATE_DELAY_S = 5; void InotifyQueue::OnTimeout() diff --git a/src/InotifyUpdate.cxx b/src/InotifyUpdate.cxx index f02843ad4..5a015508a 100644 --- a/src/InotifyUpdate.cxx +++ b/src/InotifyUpdate.cxx @@ -39,13 +39,12 @@ #include #include -enum { - IN_MASK = IN_ATTRIB|IN_CLOSE_WRITE|IN_CREATE|IN_DELETE|IN_DELETE_SELF - |IN_MOVE|IN_MOVE_SELF +static constexpr unsigned IN_MASK = #ifdef IN_ONLYDIR - |IN_ONLYDIR + IN_ONLYDIR| #endif -}; + IN_ATTRIB|IN_CLOSE_WRITE|IN_CREATE|IN_DELETE|IN_DELETE_SELF + |IN_MOVE|IN_MOVE_SELF; struct WatchDirectory { WatchDirectory *parent; diff --git a/test/run_inotify.cxx b/test/run_inotify.cxx index fb614432e..c57e6e9ef 100644 --- a/test/run_inotify.cxx +++ b/test/run_inotify.cxx @@ -28,13 +28,12 @@ #include -enum { - IN_MASK = IN_ATTRIB|IN_CLOSE_WRITE|IN_CREATE|IN_DELETE|IN_DELETE_SELF - |IN_MOVE|IN_MOVE_SELF +static constexpr unsigned IN_MASK = #ifdef IN_ONLYDIR - |IN_ONLYDIR + IN_ONLYDIR| #endif -}; + IN_ATTRIB|IN_CLOSE_WRITE|IN_CREATE|IN_DELETE|IN_DELETE_SELF + |IN_MOVE|IN_MOVE_SELF; static void my_inotify_callback(gcc_unused int wd, unsigned mask, -- cgit v1.2.3