diff options
| author | Murray Cumming <murrayc@murayc.com> | 2008-03-05 00:07:46 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2008-03-05 00:07:46 +0000 |
| commit | 98ef98f4e8edf2688cdb464a8280943990250ba7 (patch) | |
| tree | 3ca7ec89b8a018bf10ba05de82946f269741adc1 | |
| parent | 6077711742ac64802b9ce220e15b5fecc77e4f20 (diff) | |
| download | glibmm-98ef98f4e8edf2688cdb464a8280943990250ba7.tar.gz | |
Use __CONVERT_CONST_REFPTR_TO_P_SUN() instead of __CONVERT_REFPTR_TO_P()
2008-03-05 Murray Cumming <murrayc@murayc.com>
* tools/m4/convert_gio.m4: Use __CONVERT_CONST_REFPTR_TO_P_SUN() instead
of __CONVERT_REFPTR_TO_P() to maybe fix the build with Sun CC.
(Simon Zheng)
svn path=/trunk/; revision=636
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tools/m4/convert_gio.m4 | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2008-03-05 Murray Cumming <murrayc@murayc.com> + + * tools/m4/convert_gio.m4: Use __CONVERT_CONST_REFPTR_TO_P_SUN() instead + of __CONVERT_REFPTR_TO_P() to maybe fix the build with Sun CC. + (Simon Zheng) + 2008-03-04 Jonathon Jongsma <jjongsma@gnome.org> * Makefile.am: updated the 'release' target to give a bit more helpful error diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index 5ea6514a..5eab3237 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -44,7 +44,7 @@ _CONVERSION(`GDrive*',`Glib::RefPtr<Drive>',`Glib::wrap($3)') _CONVERSION(`return-char*',`std::string',`Glib::convert_return_gchar_ptr_to_stdstring($3)') _CONVERSION(`Glib::RefPtr<File>',`GFile*',__CONVERT_REFPTR_TO_P) _CONVERSION(`const Glib::RefPtr<File>&',`GFile*',__CONVERT_REFPTR_TO_P) -_CONVERSION(`const Glib::RefPtr<const File>&',`GFile*',__CONVERT_CONST_REFPTR_TO_P) +_CONVERSION(`const Glib::RefPtr<const File>&',`GFile*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gio::File)) _CONVERSION(`GFile*',`Glib::RefPtr<File>',`Glib::wrap($3)') |