diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2021-05-07 12:21:24 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2021-05-07 12:21:24 +0800 |
commit | 29b9a102832b87a607410f455290d3da377283b0 (patch) | |
tree | 5e282fa7c1d71a20489b7e35d0b822474211ea78 /gio | |
parent | c4392f49d1313fbc159882e993683909ea40f188 (diff) | |
download | glibmm-29b9a102832b87a607410f455290d3da377283b0.tar.gz |
Don't mark the Glib::Source class with GLIBMM_API
Instead, mark the individual members with GLIBMM_API so that we avoid having
the code tied to a particular STL and compiler version.
Update the classes that derive from Glib::Source accordingly as well
Diffstat (limited to 'gio')
-rw-r--r-- | gio/giomm/socketsource.h | 14 | ||||
-rw-r--r-- | gio/src/socket.hg | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gio/giomm/socketsource.h b/gio/giomm/socketsource.h index f626a88b..477e0e3d 100644 --- a/gio/giomm/socketsource.h +++ b/gio/giomm/socketsource.h @@ -102,31 +102,31 @@ SignalSocket signal_socket( * @newin{2,42} * @ingroup NetworkIO */ -class GIOMM_API SocketSource : public Glib::IOSource +class SocketSource : public Glib::IOSource { public: using CppObjectType = Gio::SocketSource; - static Glib::RefPtr<SocketSource> create(const Glib::RefPtr<Socket>& socket, + GIOMM_API static Glib::RefPtr<SocketSource> create(const Glib::RefPtr<Socket>& socket, Glib::IOCondition condition, const Glib::RefPtr<Cancellable>& cancellable = {}); protected: - SocketSource(const Glib::RefPtr<Socket>& socket, Glib::IOCondition condition, + GIOMM_API SocketSource(const Glib::RefPtr<Socket>& socket, Glib::IOCondition condition, const Glib::RefPtr<Cancellable>& cancellable); - ~SocketSource() noexcept override; + GIOMM_API ~SocketSource() noexcept override; private: - friend Socket; + friend GIOMM_API Socket; // This is just to avoid the need for Gio::Socket to create a RefPtr<> to itself. - static Glib::RefPtr<SocketSource> create(GSocket* socket, + GIOMM_API static Glib::RefPtr<SocketSource> create(GSocket* socket, Glib::IOCondition condition, const Glib::RefPtr<Cancellable>& cancellable = {}); // This is just to avoid the need for Gio::Socket to create a RefPtr<> to itself. - SocketSource(GSocket* socket, Glib::IOCondition condition, + GIOMM_API SocketSource(GSocket* socket, Glib::IOCondition condition, const Glib::RefPtr<Cancellable>& cancellable); }; diff --git a/gio/src/socket.hg b/gio/src/socket.hg index c790bb54..bb6bcdc0 100644 --- a/gio/src/socket.hg +++ b/gio/src/socket.hg @@ -28,7 +28,7 @@ _PINCLUDE(glibmm/private/object_p.h) namespace Gio { -class GIOMM_API SocketSource; +class SocketSource; /** @defgroup NetworkIO Portable Network I/O Functionality |