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/init.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/init.cc')
| -rw-r--r-- | glib/glibmm/init.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/glib/glibmm/init.cc b/glib/glibmm/init.cc index 0710f3f4..92555607 100644 --- a/glib/glibmm/init.cc +++ b/glib/glibmm/init.cc @@ -1,6 +1,3 @@ -// -*- c++ -*- -/* $Id$ */ - /* Copyright (C) 2003 The glibmm Development Team * * This library is free software; you can redistribute it and/or @@ -18,7 +15,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <glibmm/wrap.h> +#include <glibmm/init.h> #include <glibmm/error.h> namespace Glib @@ -26,9 +23,8 @@ namespace Glib void init() { - Glib::wrap_register_init(); - Glib::Error::register_init(); //also calls Glib::wrap_init(); + // Also calls Glib::wrap_register_init() and Glib::wrap_init(). + Glib::Error::register_init(); } } // namespace Glib - |