diff options
| author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
|---|---|---|
| committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
| commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
| tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /glib/glibmm/dispatcher.cc | |
| parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
| parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
| download | glibmm-gir-gmmproc.tar.gz | |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'glib/glibmm/dispatcher.cc')
| -rw-r--r-- | glib/glibmm/dispatcher.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/glib/glibmm/dispatcher.cc b/glib/glibmm/dispatcher.cc index f6257f36..d6117312 100644 --- a/glib/glibmm/dispatcher.cc +++ b/glib/glibmm/dispatcher.cc @@ -127,6 +127,10 @@ class DispatchNotifier : public sigc::trackable public: ~DispatchNotifier(); + // noncopyable + DispatchNotifier(const DispatchNotifier&) = delete; + DispatchNotifier& operator=(const DispatchNotifier&) = delete; + static DispatchNotifier* reference_instance( const Glib::RefPtr<MainContext>& context, const Dispatcher* dispatcher); static void unreference_instance( @@ -158,10 +162,6 @@ private: void create_pipe(); bool pipe_io_handler(Glib::IOCondition condition); bool pipe_is_empty(); - - // noncopyable - DispatchNotifier(const DispatchNotifier&); - DispatchNotifier& operator=(const DispatchNotifier&); }; /**** Glib::DispatchNotifier ***********************************************/ @@ -197,7 +197,7 @@ DispatchNotifier::DispatchNotifier(const Glib::RefPtr<MainContext>& context) // sigc::mem_fun(*this, &DispatchNotifier::pipe_io_handler), fd, Glib::IO_IN); // except for source->set_can_recurse(true). - const Glib::RefPtr<IOSource> source = IOSource::create(fd, Glib::IO_IN); + const auto source = IOSource::create(fd, Glib::IO_IN); // If the signal emission in pipe_io_handler() starts a new main loop, // the event source shall not be blocked while that loop runs. (E.g. while |