summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2017-04-18 20:04:46 +0200
committerMurray Cumming <murrayc@murrayc.com>2017-04-18 21:53:16 +0200
commitf34711a6ef6bad22c4c408e9af696e7a5ac22af8 (patch)
tree317e6d5fba3955f061744024bd382a0f0b7ab8da
parentdf1054edd96b72b3afba661f71631cfdc9e18e15 (diff)
downloadglibmm-f34711a6ef6bad22c4c408e9af696e7a5ac22af8.tar.gz
Module: Change ModuleFlags to Module::Flags.
-rw-r--r--glib/src/module.ccg2
-rw-r--r--glib/src/module.hg6
2 files changed, 4 insertions, 4 deletions
diff --git a/glib/src/module.ccg b/glib/src/module.ccg
index 2cf23fd0..37ead866 100644
--- a/glib/src/module.ccg
+++ b/glib/src/module.ccg
@@ -21,7 +21,7 @@
namespace Glib
{
-Module::Module(const std::string& file_name, ModuleFlags flags)
+Module::Module(const std::string& file_name, Flags flags)
: gobject_(g_module_open(file_name.c_str(), (GModuleFlags)flags))
{
}
diff --git a/glib/src/module.hg b/glib/src/module.hg
index dddb5249..bb6f428f 100644
--- a/glib/src/module.hg
+++ b/glib/src/module.hg
@@ -26,8 +26,6 @@ extern "C" { typedef struct _GModule GModule; }
namespace Glib
{
-_WRAP_ENUM(ModuleFlags, GModuleFlags, NO_GTYPE)
-
//TODO: Replace get_last_error() with exceptions?
//Provide operator()?
@@ -45,6 +43,8 @@ class Module
public:
+ _WRAP_ENUM(Flags, GModuleFlags, NO_GTYPE)
+
/** Opens a module.
*
* First of all it tries to open file_name as a module. If that
@@ -69,7 +69,7 @@ public:
* @param file_name The library filename to open
* @param flags Flags to configure the load process
*/
- explicit Module(const std::string& file_name, ModuleFlags flags = ModuleFlags(0));
+ explicit Module(const std::string& file_name, Flags flags = Flags(0));
Module(const Module&) = delete;
Module& operator=(const Module&) = delete;